From 7880889720de18a19e58653cb3b07da99053e7db Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 22 Oct 2009 16:53:10 +0000 Subject: [PATCH] Rebake everything using bakefile 0.2.7. Also updated aclocal inputs and regenerated configure. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 19 +- autoconf_inc.m4 | 4 +- build/aclocal/bakefile-lang.m4 | 2 +- build/aclocal/bakefile.m4 | 6 +- build/msw/config.bcc | 424 ++--- build/msw/config.gcc | 294 +-- build/msw/config.vc | 298 +-- build/msw/config.wat | 280 +-- build/msw/makefile.bcc | 26 +- build/msw/makefile.gcc | 28 +- build/msw/makefile.vc | 1477 ++++++++++----- build/msw/makefile.wat | 30 +- build/msw/wx_base.dsp | 64 +- build/msw/wx_core.dsp | 4 + build/msw/wx_vc7_adv.vcproj | 2 +- build/msw/wx_vc7_aui.vcproj | 2 +- build/msw/wx_vc7_base.vcproj | 54 +- build/msw/wx_vc7_core.vcproj | 5 +- build/msw/wx_vc7_gl.vcproj | 2 +- build/msw/wx_vc7_html.vcproj | 2 +- build/msw/wx_vc7_media.vcproj | 2 +- build/msw/wx_vc7_net.vcproj | 2 +- build/msw/wx_vc7_propgrid.vcproj | 2 +- build/msw/wx_vc7_qa.vcproj | 2 +- build/msw/wx_vc7_ribbon.vcproj | 2 +- build/msw/wx_vc7_richtext.vcproj | 2 +- build/msw/wx_vc7_stc.vcproj | 2 +- build/msw/wx_vc7_wxexpat.vcproj | 50 +- build/msw/wx_vc7_wxjpeg.vcproj | 50 +- build/msw/wx_vc7_wxpng.vcproj | 50 +- build/msw/wx_vc7_wxregex.vcproj | 50 +- build/msw/wx_vc7_wxscintilla.vcproj | 50 +- build/msw/wx_vc7_wxtiff.vcproj | 50 +- build/msw/wx_vc7_wxzlib.vcproj | 50 +- build/msw/wx_vc7_xml.vcproj | 2 +- build/msw/wx_vc7_xrc.vcproj | 2 +- build/msw/wx_vc8_adv.vcproj | 2 +- build/msw/wx_vc8_aui.vcproj | 2 +- build/msw/wx_vc8_base.vcproj | 70 +- build/msw/wx_vc8_core.vcproj | 6 +- build/msw/wx_vc8_gl.vcproj | 2 +- build/msw/wx_vc8_html.vcproj | 2 +- build/msw/wx_vc8_media.vcproj | 2 +- build/msw/wx_vc8_net.vcproj | 2 +- build/msw/wx_vc8_propgrid.vcproj | 2 +- build/msw/wx_vc8_qa.vcproj | 2 +- build/msw/wx_vc8_ribbon.vcproj | 2 +- build/msw/wx_vc8_richtext.vcproj | 2 +- build/msw/wx_vc8_stc.vcproj | 2 +- build/msw/wx_vc8_wxexpat.vcproj | 50 +- build/msw/wx_vc8_wxjpeg.vcproj | 50 +- build/msw/wx_vc8_wxpng.vcproj | 50 +- build/msw/wx_vc8_wxregex.vcproj | 50 +- build/msw/wx_vc8_wxscintilla.vcproj | 50 +- build/msw/wx_vc8_wxtiff.vcproj | 50 +- build/msw/wx_vc8_wxzlib.vcproj | 50 +- build/msw/wx_vc8_xml.vcproj | 2 +- build/msw/wx_vc8_xrc.vcproj | 2 +- build/msw/wx_vc9_adv.vcproj | 2 +- build/msw/wx_vc9_aui.vcproj | 2 +- build/msw/wx_vc9_base.vcproj | 70 +- build/msw/wx_vc9_core.vcproj | 6 +- build/msw/wx_vc9_gl.vcproj | 2 +- build/msw/wx_vc9_html.vcproj | 2 +- build/msw/wx_vc9_media.vcproj | 2 +- build/msw/wx_vc9_net.vcproj | 2 +- build/msw/wx_vc9_propgrid.vcproj | 2 +- build/msw/wx_vc9_qa.vcproj | 2 +- build/msw/wx_vc9_ribbon.vcproj | 2 +- build/msw/wx_vc9_richtext.vcproj | 2 +- build/msw/wx_vc9_stc.vcproj | 2 +- build/msw/wx_vc9_wxexpat.vcproj | 2 +- build/msw/wx_vc9_wxjpeg.vcproj | 2 +- build/msw/wx_vc9_wxpng.vcproj | 2 +- build/msw/wx_vc9_wxregex.vcproj | 2 +- build/msw/wx_vc9_wxscintilla.vcproj | 2 +- build/msw/wx_vc9_wxtiff.vcproj | 2 +- build/msw/wx_vc9_wxzlib.vcproj | 2 +- build/msw/wx_vc9_xml.vcproj | 2 +- build/msw/wx_vc9_xrc.vcproj | 2 +- configure | 6 +- demos/Makefile.in | 2 +- demos/bombs/Makefile.in | 2 +- demos/bombs/bombs.dsp | 16 +- demos/bombs/bombs_vc7.vcproj | 26 +- demos/bombs/bombs_vc8.vcproj | 18 +- demos/bombs/bombs_vc9.vcproj | 34 +- demos/bombs/makefile.bcc | 480 ++--- demos/bombs/makefile.gcc | 468 ++--- demos/bombs/makefile.vc | 663 +++---- demos/bombs/makefile.wat | 536 +++--- demos/forty/Makefile.in | 2 +- demos/forty/forty.dsp | 16 +- demos/forty/forty_vc7.vcproj | 26 +- demos/forty/forty_vc8.vcproj | 18 +- demos/forty/forty_vc9.vcproj | 34 +- demos/forty/makefile.bcc | 552 +++--- demos/forty/makefile.gcc | 540 +++--- demos/forty/makefile.vc | 735 ++++---- demos/forty/makefile.wat | 614 +++--- demos/fractal/Makefile.in | 2 +- demos/fractal/fractal.dsp | 16 +- demos/fractal/fractal_vc7.vcproj | 26 +- demos/fractal/fractal_vc8.vcproj | 18 +- demos/fractal/fractal_vc9.vcproj | 34 +- demos/fractal/makefile.bcc | 464 ++--- demos/fractal/makefile.gcc | 452 ++--- demos/fractal/makefile.vc | 647 +++---- demos/fractal/makefile.wat | 520 +++--- demos/life/Makefile.in | 2 +- demos/life/life.dsp | 16 +- demos/life/life_vc7.vcproj | 26 +- demos/life/life_vc8.vcproj | 18 +- demos/life/life_vc9.vcproj | 34 +- demos/life/makefile.bcc | 496 ++--- demos/life/makefile.gcc | 484 ++--- demos/life/makefile.vc | 679 +++---- demos/life/makefile.wat | 552 +++--- demos/makefile.bcc | 206 +-- demos/makefile.gcc | 142 +- demos/makefile.vc | 168 +- demos/makefile.wat | 208 +-- demos/poem/Makefile.in | 2 +- demos/poem/makefile.bcc | 480 ++--- demos/poem/makefile.gcc | 468 ++--- demos/poem/makefile.vc | 663 +++---- demos/poem/makefile.wat | 538 +++--- demos/poem/poem.dsp | 16 +- demos/poem/poem_vc7.vcproj | 26 +- demos/poem/poem_vc8.vcproj | 18 +- demos/poem/poem_vc9.vcproj | 34 +- samples/access/Makefile.in | 2 +- samples/access/access.dsp | 16 +- samples/access/access_vc7.vcproj | 26 +- samples/access/access_vc8.vcproj | 18 +- samples/access/access_vc9.vcproj | 34 +- samples/access/makefile.bcc | 464 ++--- samples/access/makefile.gcc | 452 ++--- samples/access/makefile.unx | 2 +- samples/access/makefile.vc | 647 +++---- samples/access/makefile.wat | 520 +++--- samples/animate/Makefile.in | 2 +- samples/animate/anitest.dsp | 16 +- samples/animate/anitest_vc7.vcproj | 26 +- samples/animate/anitest_vc8.vcproj | 18 +- samples/animate/anitest_vc9.vcproj | 34 +- samples/animate/makefile.bcc | 480 ++--- samples/animate/makefile.gcc | 468 ++--- samples/animate/makefile.unx | 2 +- samples/animate/makefile.vc | 663 +++---- samples/animate/makefile.wat | 538 +++--- samples/artprov/Makefile.in | 2 +- samples/artprov/artprov.dsp | 16 +- samples/artprov/artprov_vc7.vcproj | 26 +- samples/artprov/artprov_vc8.vcproj | 18 +- samples/artprov/artprov_vc9.vcproj | 34 +- samples/artprov/makefile.bcc | 472 ++--- samples/artprov/makefile.gcc | 460 ++--- samples/artprov/makefile.unx | 2 +- samples/artprov/makefile.vc | 655 +++---- samples/artprov/makefile.wat | 528 +++--- samples/aui/Makefile.in | 2 +- samples/aui/auidemo.dsp | 16 +- samples/aui/auidemo_vc7.vcproj | 26 +- samples/aui/auidemo_vc8.vcproj | 18 +- samples/aui/auidemo_vc9.vcproj | 34 +- samples/aui/makefile.bcc | 496 ++--- samples/aui/makefile.gcc | 484 ++--- samples/aui/makefile.unx | 2 +- samples/aui/makefile.vc | 679 +++---- samples/aui/makefile.wat | 560 +++--- samples/calendar/Makefile.in | 2 +- samples/calendar/calendar.dsp | 16 +- samples/calendar/calendar_vc7.vcproj | 26 +- samples/calendar/calendar_vc8.vcproj | 18 +- samples/calendar/calendar_vc9.vcproj | 34 +- samples/calendar/makefile.bcc | 472 ++--- samples/calendar/makefile.gcc | 460 ++--- samples/calendar/makefile.unx | 2 +- samples/calendar/makefile.vc | 655 +++---- samples/calendar/makefile.wat | 530 +++--- samples/caret/Makefile.in | 2 +- samples/caret/caret.dsp | 16 +- samples/caret/caret_vc7.vcproj | 26 +- samples/caret/caret_vc8.vcproj | 18 +- samples/caret/caret_vc9.vcproj | 34 +- samples/caret/makefile.bcc | 464 ++--- samples/caret/makefile.gcc | 452 ++--- samples/caret/makefile.unx | 2 +- samples/caret/makefile.vc | 647 +++---- samples/caret/makefile.wat | 520 +++--- samples/clipboard/Makefile.in | 2 +- samples/clipboard/clipboard.dsp | 16 +- samples/clipboard/clipboard_vc7.vcproj | 26 +- samples/clipboard/clipboard_vc8.vcproj | 18 +- samples/clipboard/clipboard_vc9.vcproj | 34 +- samples/clipboard/makefile.bcc | 464 ++--- samples/clipboard/makefile.gcc | 452 ++--- samples/clipboard/makefile.unx | 2 +- samples/clipboard/makefile.vc | 647 +++---- samples/clipboard/makefile.wat | 520 +++--- samples/collpane/Makefile.in | 2 +- samples/collpane/collpane.dsp | 16 +- samples/collpane/collpane_vc7.vcproj | 26 +- samples/collpane/collpane_vc8.vcproj | 18 +- samples/collpane/collpane_vc9.vcproj | 34 +- samples/collpane/makefile.bcc | 472 ++--- samples/collpane/makefile.gcc | 460 ++--- samples/collpane/makefile.unx | 2 +- samples/collpane/makefile.vc | 655 +++---- samples/collpane/makefile.wat | 530 +++--- samples/combo/Makefile.in | 2 +- samples/combo/combo.dsp | 16 +- samples/combo/combo_vc7.vcproj | 26 +- samples/combo/combo_vc8.vcproj | 18 +- samples/combo/combo_vc9.vcproj | 34 +- samples/combo/makefile.bcc | 480 ++--- samples/combo/makefile.gcc | 468 ++--- samples/combo/makefile.unx | 2 +- samples/combo/makefile.vc | 663 +++---- samples/combo/makefile.wat | 538 +++--- samples/config/Makefile.in | 2 +- samples/config/config.dsp | 16 +- samples/config/config_vc7.vcproj | 26 +- samples/config/config_vc8.vcproj | 18 +- samples/config/config_vc9.vcproj | 34 +- samples/config/makefile.bcc | 464 ++--- samples/config/makefile.gcc | 452 ++--- samples/config/makefile.unx | 2 +- samples/config/makefile.vc | 647 +++---- samples/config/makefile.wat | 520 +++--- samples/console/Makefile.in | 2 +- samples/console/console.dsp | 16 +- samples/console/console_vc7.vcproj | 26 +- samples/console/console_vc8.vcproj | 18 +- samples/console/console_vc9.vcproj | 34 +- samples/console/makefile.bcc | 388 ++-- samples/console/makefile.gcc | 374 ++-- samples/console/makefile.unx | 2 +- samples/console/makefile.vc | 532 +++--- samples/console/makefile.wat | 496 ++--- samples/controls/Makefile.in | 2 +- samples/controls/controls.dsp | 16 +- samples/controls/controls_vc7.vcproj | 26 +- samples/controls/controls_vc8.vcproj | 18 +- samples/controls/controls_vc9.vcproj | 34 +- samples/controls/makefile.bcc | 472 ++--- samples/controls/makefile.gcc | 460 ++--- samples/controls/makefile.unx | 2 +- samples/controls/makefile.vc | 655 +++---- samples/controls/makefile.wat | 528 +++--- samples/dataview/Makefile.in | 2 +- samples/dataview/dataview.dsp | 16 +- samples/dataview/dataview_vc7.vcproj | 26 +- samples/dataview/dataview_vc8.vcproj | 18 +- samples/dataview/dataview_vc9.vcproj | 34 +- samples/dataview/makefile.bcc | 480 ++--- samples/dataview/makefile.gcc | 468 ++--- samples/dataview/makefile.unx | 2 +- samples/dataview/makefile.vc | 663 +++---- samples/dataview/makefile.wat | 538 +++--- samples/debugrpt/Makefile.in | 2 +- samples/debugrpt/debugrpt.dsp | 16 +- samples/debugrpt/debugrpt_vc7.vcproj | 26 +- samples/debugrpt/debugrpt_vc8.vcproj | 18 +- samples/debugrpt/debugrpt_vc9.vcproj | 34 +- samples/debugrpt/makefile.bcc | 480 ++--- samples/debugrpt/makefile.gcc | 468 ++--- samples/debugrpt/makefile.unx | 2 +- samples/debugrpt/makefile.vc | 663 +++---- samples/debugrpt/makefile.wat | 540 +++--- samples/dialogs/Makefile.in | 2 +- samples/dialogs/dialogs.dsp | 16 +- samples/dialogs/dialogs_vc7.vcproj | 26 +- samples/dialogs/dialogs_vc8.vcproj | 18 +- samples/dialogs/dialogs_vc9.vcproj | 34 +- samples/dialogs/makefile.bcc | 520 +++--- samples/dialogs/makefile.gcc | 512 ++--- samples/dialogs/makefile.unx | 2 +- samples/dialogs/makefile.vc | 703 +++---- samples/dialogs/makefile.wat | 584 +++--- samples/dialup/Makefile.in | 2 +- samples/dialup/dialup.dsp | 16 +- samples/dialup/dialup_vc7.vcproj | 26 +- samples/dialup/dialup_vc8.vcproj | 18 +- samples/dialup/dialup_vc9.vcproj | 34 +- samples/dialup/makefile.bcc | 464 ++--- samples/dialup/makefile.gcc | 452 ++--- samples/dialup/makefile.unx | 2 +- samples/dialup/makefile.vc | 647 +++---- samples/dialup/makefile.wat | 520 +++--- samples/display/Makefile.in | 2 +- samples/display/display.dsp | 16 +- samples/display/display_vc7.vcproj | 26 +- samples/display/display_vc8.vcproj | 18 +- samples/display/display_vc9.vcproj | 34 +- samples/display/makefile.bcc | 464 ++--- samples/display/makefile.gcc | 452 ++--- samples/display/makefile.unx | 2 +- samples/display/makefile.vc | 647 +++---- samples/display/makefile.wat | 520 +++--- samples/dnd/Makefile.in | 2 +- samples/dnd/dnd.dsp | 16 +- samples/dnd/dnd_vc7.vcproj | 26 +- samples/dnd/dnd_vc8.vcproj | 18 +- samples/dnd/dnd_vc9.vcproj | 34 +- samples/dnd/makefile.bcc | 472 ++--- samples/dnd/makefile.gcc | 460 ++--- samples/dnd/makefile.unx | 2 +- samples/dnd/makefile.vc | 655 +++---- samples/dnd/makefile.wat | 528 +++--- samples/docview/Makefile.in | 2 +- samples/docview/docview.dsp | 16 +- samples/docview/docview_vc7.vcproj | 26 +- samples/docview/docview_vc8.vcproj | 18 +- samples/docview/docview_vc9.vcproj | 34 +- samples/docview/makefile.bcc | 480 ++--- samples/docview/makefile.gcc | 468 ++--- samples/docview/makefile.unx | 2 +- samples/docview/makefile.vc | 663 +++---- samples/docview/makefile.wat | 536 +++--- samples/dragimag/Makefile.in | 2 +- samples/dragimag/dragimag.dsp | 16 +- samples/dragimag/dragimag_vc7.vcproj | 26 +- samples/dragimag/dragimag_vc8.vcproj | 18 +- samples/dragimag/dragimag_vc9.vcproj | 34 +- samples/dragimag/makefile.bcc | 472 ++--- samples/dragimag/makefile.gcc | 460 ++--- samples/dragimag/makefile.unx | 2 +- samples/dragimag/makefile.vc | 655 +++---- samples/dragimag/makefile.wat | 528 +++--- samples/drawing/Makefile.in | 2 +- samples/drawing/drawing.dsp | 16 +- samples/drawing/drawing_vc7.vcproj | 26 +- samples/drawing/drawing_vc8.vcproj | 18 +- samples/drawing/drawing_vc9.vcproj | 34 +- samples/drawing/makefile.bcc | 472 ++--- samples/drawing/makefile.gcc | 460 ++--- samples/drawing/makefile.unx | 2 +- samples/drawing/makefile.vc | 655 +++---- samples/drawing/makefile.wat | 528 +++--- samples/erase/Makefile.in | 2 +- samples/erase/erase.dsp | 16 +- samples/erase/erase_vc7.vcproj | 26 +- samples/erase/erase_vc8.vcproj | 18 +- samples/erase/erase_vc9.vcproj | 34 +- samples/erase/makefile.bcc | 464 ++--- samples/erase/makefile.gcc | 452 ++--- samples/erase/makefile.unx | 2 +- samples/erase/makefile.vc | 647 +++---- samples/erase/makefile.wat | 520 +++--- samples/event/Makefile.in | 2 +- samples/event/event.dsp | 16 +- samples/event/event_vc7.vcproj | 26 +- samples/event/event_vc8.vcproj | 18 +- samples/event/event_vc9.vcproj | 34 +- samples/event/makefile.bcc | 464 ++--- samples/event/makefile.gcc | 452 ++--- samples/event/makefile.unx | 2 +- samples/event/makefile.vc | 647 +++---- samples/event/makefile.wat | 520 +++--- samples/except/Makefile.in | 2 +- samples/except/except.dsp | 16 +- samples/except/except_vc7.vcproj | 26 +- samples/except/except_vc8.vcproj | 18 +- samples/except/except_vc9.vcproj | 34 +- samples/except/makefile.bcc | 464 ++--- samples/except/makefile.gcc | 452 ++--- samples/except/makefile.unx | 2 +- samples/except/makefile.vc | 647 +++---- samples/except/makefile.wat | 520 +++--- samples/exec/Makefile.in | 2 +- samples/exec/exec.dsp | 16 +- samples/exec/exec_vc7.vcproj | 26 +- samples/exec/exec_vc8.vcproj | 18 +- samples/exec/exec_vc9.vcproj | 34 +- samples/exec/makefile.bcc | 464 ++--- samples/exec/makefile.gcc | 452 ++--- samples/exec/makefile.unx | 2 +- samples/exec/makefile.vc | 647 +++---- samples/exec/makefile.wat | 520 +++--- samples/flash/flash.dsp | 16 +- samples/flash/flash_vc7.vcproj | 26 +- samples/flash/flash_vc8.vcproj | 18 +- samples/flash/flash_vc9.vcproj | 34 +- samples/flash/makefile.vc | 647 +++---- samples/font/Makefile.in | 2 +- samples/font/font.dsp | 16 +- samples/font/font_vc7.vcproj | 26 +- samples/font/font_vc8.vcproj | 18 +- samples/font/font_vc9.vcproj | 34 +- samples/font/makefile.bcc | 464 ++--- samples/font/makefile.gcc | 452 ++--- samples/font/makefile.unx | 2 +- samples/font/makefile.vc | 647 +++---- samples/font/makefile.wat | 520 +++--- samples/fswatcher/Makefile.in | 30 +- samples/fswatcher/fswatcher.dsp | 528 +++--- samples/fswatcher/fswatcher_vc7.vcproj | 1114 +++++------ samples/fswatcher/fswatcher_vc8.vcproj | 1644 ++++++++-------- samples/fswatcher/fswatcher_vc9.vcproj | 1588 ++++++++-------- samples/fswatcher/makefile.bcc | 16 +- samples/fswatcher/makefile.gcc | 18 +- samples/fswatcher/makefile.unx | 28 +- samples/fswatcher/makefile.vc | 102 +- samples/fswatcher/makefile.wat | 20 +- samples/grid/Makefile.in | 2 +- samples/grid/grid.dsp | 16 +- samples/grid/grid_vc7.vcproj | 26 +- samples/grid/grid_vc8.vcproj | 18 +- samples/grid/grid_vc9.vcproj | 34 +- samples/grid/makefile.bcc | 472 ++--- samples/grid/makefile.gcc | 460 ++--- samples/grid/makefile.unx | 2 +- samples/grid/makefile.vc | 655 +++---- samples/grid/makefile.wat | 530 +++--- samples/help/Makefile.in | 2 +- samples/help/help.dsp | 16 +- samples/help/help_vc7.vcproj | 26 +- samples/help/help_vc8.vcproj | 18 +- samples/help/help_vc9.vcproj | 34 +- samples/help/makefile.bcc | 496 ++--- samples/help/makefile.gcc | 484 ++--- samples/help/makefile.unx | 2 +- samples/help/makefile.vc | 679 +++---- samples/help/makefile.wat | 556 +++--- samples/htlbox/Makefile.in | 2 +- samples/htlbox/htlbox.dsp | 16 +- samples/htlbox/htlbox_vc7.vcproj | 26 +- samples/htlbox/htlbox_vc8.vcproj | 18 +- samples/htlbox/htlbox_vc9.vcproj | 34 +- samples/htlbox/makefile.bcc | 472 ++--- samples/htlbox/makefile.gcc | 460 ++--- samples/htlbox/makefile.unx | 2 +- samples/htlbox/makefile.vc | 655 +++---- samples/htlbox/makefile.wat | 530 +++--- samples/html/Makefile.in | 2 +- samples/html/about/Makefile.in | 2 +- samples/html/about/about.dsp | 16 +- samples/html/about/about_vc7.vcproj | 26 +- samples/html/about/about_vc8.vcproj | 18 +- samples/html/about/about_vc9.vcproj | 34 +- samples/html/about/makefile.bcc | 480 ++--- samples/html/about/makefile.gcc | 468 ++--- samples/html/about/makefile.unx | 2 +- samples/html/about/makefile.vc | 663 +++---- samples/html/about/makefile.wat | 538 +++--- samples/html/help/Makefile.in | 2 +- samples/html/help/help.dsp | 16 +- samples/html/help/help_vc7.vcproj | 26 +- samples/html/help/help_vc8.vcproj | 18 +- samples/html/help/help_vc9.vcproj | 34 +- samples/html/help/makefile.bcc | 480 ++--- samples/html/help/makefile.gcc | 468 ++--- samples/html/help/makefile.unx | 2 +- samples/html/help/makefile.vc | 663 +++---- samples/html/help/makefile.wat | 538 +++--- samples/html/helpview/Makefile.in | 2 +- samples/html/helpview/helpview.dsp | 16 +- samples/html/helpview/helpview_vc7.vcproj | 26 +- samples/html/helpview/helpview_vc8.vcproj | 18 +- samples/html/helpview/helpview_vc9.vcproj | 34 +- samples/html/helpview/makefile.bcc | 480 ++--- samples/html/helpview/makefile.gcc | 468 ++--- samples/html/helpview/makefile.unx | 2 +- samples/html/helpview/makefile.vc | 663 +++---- samples/html/helpview/makefile.wat | 538 +++--- samples/html/htmlctrl/Makefile.in | 2 +- samples/html/htmlctrl/makefile.unx | 2 +- samples/html/makefile.bcc | 266 +-- samples/html/makefile.gcc | 166 +- samples/html/makefile.unx | 2 +- samples/html/makefile.vc | 216 +-- samples/html/makefile.wat | 256 +-- samples/html/printing/Makefile.in | 2 +- samples/html/printing/makefile.bcc | 480 ++--- samples/html/printing/makefile.gcc | 468 ++--- samples/html/printing/makefile.unx | 2 +- samples/html/printing/makefile.vc | 663 +++---- samples/html/printing/makefile.wat | 538 +++--- samples/html/printing/printing.dsp | 16 +- samples/html/printing/printing_vc7.vcproj | 26 +- samples/html/printing/printing_vc8.vcproj | 18 +- samples/html/printing/printing_vc9.vcproj | 34 +- samples/html/test/Makefile.in | 2 +- samples/html/test/makefile.bcc | 488 ++--- samples/html/test/makefile.gcc | 476 ++--- samples/html/test/makefile.unx | 2 +- samples/html/test/makefile.vc | 671 +++---- samples/html/test/makefile.wat | 548 +++--- samples/html/test/test.dsp | 16 +- samples/html/test/test_vc7.vcproj | 26 +- samples/html/test/test_vc8.vcproj | 18 +- samples/html/test/test_vc9.vcproj | 34 +- samples/html/virtual/Makefile.in | 2 +- samples/html/virtual/makefile.bcc | 480 ++--- samples/html/virtual/makefile.gcc | 468 ++--- samples/html/virtual/makefile.unx | 2 +- samples/html/virtual/makefile.vc | 663 +++---- samples/html/virtual/makefile.wat | 538 +++--- samples/html/virtual/virtual.dsp | 16 +- samples/html/virtual/virtual_vc7.vcproj | 26 +- samples/html/virtual/virtual_vc8.vcproj | 18 +- samples/html/virtual/virtual_vc9.vcproj | 34 +- samples/html/widget/Makefile.in | 2 +- samples/html/widget/makefile.bcc | 480 ++--- samples/html/widget/makefile.gcc | 468 ++--- samples/html/widget/makefile.unx | 2 +- samples/html/widget/makefile.vc | 663 +++---- samples/html/widget/makefile.wat | 538 +++--- samples/html/widget/widget.dsp | 16 +- samples/html/widget/widget_vc7.vcproj | 26 +- samples/html/widget/widget_vc8.vcproj | 18 +- samples/html/widget/widget_vc9.vcproj | 34 +- samples/html/zip/Makefile.in | 2 +- samples/html/zip/makefile.bcc | 480 ++--- samples/html/zip/makefile.gcc | 468 ++--- samples/html/zip/makefile.unx | 2 +- samples/html/zip/makefile.vc | 663 +++---- samples/html/zip/makefile.wat | 538 +++--- samples/html/zip/zip.dsp | 16 +- samples/html/zip/zip_vc7.vcproj | 26 +- samples/html/zip/zip_vc8.vcproj | 18 +- samples/html/zip/zip_vc9.vcproj | 34 +- samples/image/Makefile.in | 2 +- samples/image/image.dsp | 16 +- samples/image/image_vc7.vcproj | 26 +- samples/image/image_vc8.vcproj | 18 +- samples/image/image_vc9.vcproj | 34 +- samples/image/makefile.bcc | 480 ++--- samples/image/makefile.gcc | 468 ++--- samples/image/makefile.unx | 2 +- samples/image/makefile.vc | 663 +++---- samples/image/makefile.wat | 536 +++--- samples/internat/Makefile.in | 2 +- samples/internat/internat.dsp | 16 +- samples/internat/internat_vc7.vcproj | 26 +- samples/internat/internat_vc8.vcproj | 18 +- samples/internat/internat_vc9.vcproj | 34 +- samples/internat/makefile.bcc | 560 +++--- samples/internat/makefile.gcc | 548 +++--- samples/internat/makefile.unx | 2 +- samples/internat/makefile.vc | 743 ++++---- samples/internat/makefile.wat | 616 +++--- samples/ipc/Makefile.in | 2 +- samples/ipc/ipc_baseipcclient.dsp | 16 +- samples/ipc/ipc_baseipcserver.dsp | 16 +- samples/ipc/ipc_ipcclient.dsp | 16 +- samples/ipc/ipc_ipcserver.dsp | 16 +- samples/ipc/ipc_vc7_baseipcclient.vcproj | 26 +- samples/ipc/ipc_vc7_baseipcserver.vcproj | 26 +- samples/ipc/ipc_vc7_ipcclient.vcproj | 26 +- samples/ipc/ipc_vc7_ipcserver.vcproj | 26 +- samples/ipc/ipc_vc8_baseipcclient.vcproj | 18 +- samples/ipc/ipc_vc8_baseipcserver.vcproj | 18 +- samples/ipc/ipc_vc8_ipcclient.vcproj | 18 +- samples/ipc/ipc_vc8_ipcserver.vcproj | 18 +- samples/ipc/ipc_vc9_baseipcclient.vcproj | 34 +- samples/ipc/ipc_vc9_baseipcserver.vcproj | 34 +- samples/ipc/ipc_vc9_ipcclient.vcproj | 34 +- samples/ipc/ipc_vc9_ipcserver.vcproj | 34 +- samples/ipc/makefile.bcc | 630 +++---- samples/ipc/makefile.gcc | 584 +++--- samples/ipc/makefile.unx | 2 +- samples/ipc/makefile.vc | 882 +++++---- samples/ipc/makefile.wat | 706 +++---- samples/joytest/Makefile.in | 2 +- samples/joytest/joytest.dsp | 16 +- samples/joytest/joytest_vc7.vcproj | 26 +- samples/joytest/joytest_vc8.vcproj | 18 +- samples/joytest/joytest_vc9.vcproj | 34 +- samples/joytest/makefile.bcc | 472 ++--- samples/joytest/makefile.gcc | 460 ++--- samples/joytest/makefile.unx | 2 +- samples/joytest/makefile.vc | 655 +++---- samples/joytest/makefile.wat | 530 +++--- samples/keyboard/Makefile.in | 2 +- samples/keyboard/keyboard.dsp | 16 +- samples/keyboard/keyboard_vc7.vcproj | 26 +- samples/keyboard/keyboard_vc8.vcproj | 18 +- samples/keyboard/keyboard_vc9.vcproj | 34 +- samples/keyboard/makefile.bcc | 464 ++--- samples/keyboard/makefile.gcc | 452 ++--- samples/keyboard/makefile.unx | 2 +- samples/keyboard/makefile.vc | 647 +++---- samples/keyboard/makefile.wat | 520 +++--- samples/layout/Makefile.in | 2 +- samples/layout/layout.dsp | 16 +- samples/layout/layout_vc7.vcproj | 26 +- samples/layout/layout_vc8.vcproj | 18 +- samples/layout/layout_vc9.vcproj | 34 +- samples/layout/makefile.bcc | 464 ++--- samples/layout/makefile.gcc | 452 ++--- samples/layout/makefile.unx | 2 +- samples/layout/makefile.vc | 647 +++---- samples/layout/makefile.wat | 520 +++--- samples/listctrl/Makefile.in | 2 +- samples/listctrl/listctrl.dsp | 16 +- samples/listctrl/listctrl_vc7.vcproj | 26 +- samples/listctrl/listctrl_vc8.vcproj | 18 +- samples/listctrl/listctrl_vc9.vcproj | 34 +- samples/listctrl/makefile.bcc | 464 ++--- samples/listctrl/makefile.gcc | 452 ++--- samples/listctrl/makefile.unx | 2 +- samples/listctrl/makefile.vc | 647 +++---- samples/listctrl/makefile.wat | 520 +++--- samples/makefile.bcc | 1646 ++++++++--------- samples/makefile.gcc | 732 ++++---- samples/makefile.vc | 1352 +++++++------- samples/makefile.wat | 1360 +++++++------- samples/mdi/Makefile.in | 2 +- samples/mdi/makefile.bcc | 464 ++--- samples/mdi/makefile.gcc | 452 ++--- samples/mdi/makefile.unx | 2 +- samples/mdi/makefile.vc | 647 +++---- samples/mdi/makefile.wat | 520 +++--- samples/mdi/mdi.dsp | 16 +- samples/mdi/mdi_vc7.vcproj | 26 +- samples/mdi/mdi_vc8.vcproj | 18 +- samples/mdi/mdi_vc9.vcproj | 34 +- samples/mediaplayer/Makefile.in | 2 +- samples/mediaplayer/makefile.bcc | 472 ++--- samples/mediaplayer/makefile.gcc | 464 ++--- samples/mediaplayer/makefile.unx | 2 +- samples/mediaplayer/makefile.vc | 655 +++---- samples/mediaplayer/makefile.wat | 534 +++--- samples/mediaplayer/mediaplayer.dsp | 16 +- samples/mediaplayer/mediaplayer_vc7.vcproj | 26 +- samples/mediaplayer/mediaplayer_vc8.vcproj | 18 +- samples/mediaplayer/mediaplayer_vc9.vcproj | 34 +- samples/memcheck/Makefile.in | 2 +- samples/memcheck/makefile.bcc | 464 ++--- samples/memcheck/makefile.gcc | 452 ++--- samples/memcheck/makefile.unx | 2 +- samples/memcheck/makefile.vc | 647 +++---- samples/memcheck/makefile.wat | 520 +++--- samples/memcheck/memcheck.dsp | 16 +- samples/memcheck/memcheck_vc7.vcproj | 26 +- samples/memcheck/memcheck_vc8.vcproj | 18 +- samples/memcheck/memcheck_vc9.vcproj | 34 +- samples/menu/Makefile.in | 2 +- samples/menu/makefile.bcc | 464 ++--- samples/menu/makefile.gcc | 452 ++--- samples/menu/makefile.unx | 2 +- samples/menu/makefile.vc | 647 +++---- samples/menu/makefile.wat | 520 +++--- samples/menu/menu.dsp | 16 +- samples/menu/menu_vc7.vcproj | 26 +- samples/menu/menu_vc8.vcproj | 18 +- samples/menu/menu_vc9.vcproj | 34 +- samples/mfc/makefile.vc | 647 +++---- samples/mfc/mfc.dsp | 16 +- samples/mfc/mfc_vc7.vcproj | 26 +- samples/mfc/mfc_vc8.vcproj | 18 +- samples/mfc/mfc_vc9.vcproj | 34 +- samples/minimal/Makefile.in | 2 +- samples/minimal/makefile.bcc | 464 ++--- samples/minimal/makefile.gcc | 452 ++--- samples/minimal/makefile.unx | 2 +- samples/minimal/makefile.vc | 647 +++---- samples/minimal/makefile.wat | 520 +++--- samples/minimal/minimal.cpp | 17 + samples/minimal/minimal.dsp | 16 +- samples/minimal/minimal_vc7.vcproj | 26 +- samples/minimal/minimal_vc8.vcproj | 18 +- samples/minimal/minimal_vc9.vcproj | 34 +- samples/nativdlg/Makefile.in | 2 +- samples/nativdlg/makefile.bcc | 464 ++--- samples/nativdlg/makefile.gcc | 452 ++--- samples/nativdlg/makefile.unx | 2 +- samples/nativdlg/makefile.vc | 647 +++---- samples/nativdlg/makefile.wat | 520 +++--- samples/nativdlg/nativdlg.dsp | 16 +- samples/nativdlg/nativdlg_vc7.vcproj | 26 +- samples/nativdlg/nativdlg_vc8.vcproj | 18 +- samples/nativdlg/nativdlg_vc9.vcproj | 34 +- samples/notebook/Makefile.in | 2 +- samples/notebook/makefile.bcc | 464 ++--- samples/notebook/makefile.gcc | 452 ++--- samples/notebook/makefile.unx | 2 +- samples/notebook/makefile.vc | 647 +++---- samples/notebook/makefile.wat | 520 +++--- samples/notebook/notebook.dsp | 16 +- samples/notebook/notebook_vc7.vcproj | 26 +- samples/notebook/notebook_vc8.vcproj | 18 +- samples/notebook/notebook_vc9.vcproj | 34 +- samples/oleauto/Makefile.in | 2 +- samples/oleauto/makefile.bcc | 464 ++--- samples/oleauto/makefile.gcc | 452 ++--- samples/oleauto/makefile.unx | 2 +- samples/oleauto/makefile.vc | 647 +++---- samples/oleauto/makefile.wat | 520 +++--- samples/oleauto/oleauto.dsp | 16 +- samples/oleauto/oleauto_vc7.vcproj | 26 +- samples/oleauto/oleauto_vc8.vcproj | 18 +- samples/oleauto/oleauto_vc9.vcproj | 34 +- samples/opengl/Makefile.in | 2 +- samples/opengl/cube/Makefile.in | 2 +- samples/opengl/cube/cube.dsp | 16 +- samples/opengl/cube/cube_vc7.vcproj | 26 +- samples/opengl/cube/cube_vc8.vcproj | 18 +- samples/opengl/cube/cube_vc9.vcproj | 34 +- samples/opengl/cube/makefile.bcc | 474 ++--- samples/opengl/cube/makefile.gcc | 462 ++--- samples/opengl/cube/makefile.unx | 2 +- samples/opengl/cube/makefile.vc | 657 +++---- samples/opengl/cube/makefile.wat | 532 +++--- samples/opengl/isosurf/Makefile.in | 2 +- samples/opengl/isosurf/isosurf.dsp | 16 +- samples/opengl/isosurf/isosurf_vc7.vcproj | 26 +- samples/opengl/isosurf/isosurf_vc8.vcproj | 18 +- samples/opengl/isosurf/isosurf_vc9.vcproj | 34 +- samples/opengl/isosurf/makefile.bcc | 482 ++--- samples/opengl/isosurf/makefile.gcc | 470 ++--- samples/opengl/isosurf/makefile.unx | 2 +- samples/opengl/isosurf/makefile.vc | 665 +++---- samples/opengl/isosurf/makefile.wat | 540 +++--- samples/opengl/makefile.bcc | 166 +- samples/opengl/makefile.gcc | 126 +- samples/opengl/makefile.unx | 2 +- samples/opengl/makefile.vc | 136 +- samples/opengl/makefile.wat | 176 +- samples/opengl/penguin/Makefile.in | 2 +- samples/opengl/penguin/makefile.bcc | 510 ++--- samples/opengl/penguin/makefile.gcc | 498 ++--- samples/opengl/penguin/makefile.unx | 2 +- samples/opengl/penguin/makefile.vc | 696 +++---- samples/opengl/penguin/makefile.wat | 568 +++--- samples/opengl/penguin/penguin.dsp | 16 +- samples/opengl/penguin/penguin_vc7.vcproj | 26 +- samples/opengl/penguin/penguin_vc8.vcproj | 18 +- samples/opengl/penguin/penguin_vc9.vcproj | 34 +- samples/ownerdrw/Makefile.in | 2 +- samples/ownerdrw/makefile.bcc | 472 ++--- samples/ownerdrw/makefile.gcc | 460 ++--- samples/ownerdrw/makefile.unx | 2 +- samples/ownerdrw/makefile.vc | 655 +++---- samples/ownerdrw/makefile.wat | 528 +++--- samples/ownerdrw/ownerdrw.dsp | 16 +- samples/ownerdrw/ownerdrw_vc7.vcproj | 26 +- samples/ownerdrw/ownerdrw_vc8.vcproj | 18 +- samples/ownerdrw/ownerdrw_vc9.vcproj | 34 +- samples/popup/Makefile.in | 2 +- samples/popup/makefile.bcc | 464 ++--- samples/popup/makefile.gcc | 452 ++--- samples/popup/makefile.unx | 2 +- samples/popup/makefile.vc | 647 +++---- samples/popup/makefile.wat | 520 +++--- samples/popup/popup.dsp | 16 +- samples/popup/popup_vc7.vcproj | 26 +- samples/popup/popup_vc8.vcproj | 18 +- samples/popup/popup_vc9.vcproj | 34 +- samples/power/Makefile.in | 2 +- samples/power/makefile.bcc | 464 ++--- samples/power/makefile.gcc | 452 ++--- samples/power/makefile.unx | 2 +- samples/power/makefile.vc | 647 +++---- samples/power/makefile.wat | 520 +++--- samples/power/power.dsp | 16 +- samples/power/power_vc7.vcproj | 26 +- samples/power/power_vc8.vcproj | 18 +- samples/power/power_vc9.vcproj | 34 +- samples/printing/Makefile.in | 2 +- samples/printing/makefile.bcc | 464 ++--- samples/printing/makefile.gcc | 452 ++--- samples/printing/makefile.unx | 2 +- samples/printing/makefile.vc | 647 +++---- samples/printing/makefile.wat | 520 +++--- samples/printing/printing.dsp | 16 +- samples/printing/printing_vc7.vcproj | 26 +- samples/printing/printing_vc8.vcproj | 18 +- samples/printing/printing_vc9.vcproj | 34 +- samples/propgrid/Makefile.in | 2 +- samples/propgrid/makefile.bcc | 504 ++--- samples/propgrid/makefile.gcc | 492 ++--- samples/propgrid/makefile.unx | 2 +- samples/propgrid/makefile.vc | 687 +++---- samples/propgrid/makefile.wat | 564 +++--- samples/propgrid/propgrid.dsp | 16 +- samples/propgrid/propgrid_vc7.vcproj | 26 +- samples/propgrid/propgrid_vc8.vcproj | 18 +- samples/propgrid/propgrid_vc9.vcproj | 34 +- samples/regtest/Makefile.in | 2 +- samples/regtest/makefile.bcc | 464 ++--- samples/regtest/makefile.gcc | 452 ++--- samples/regtest/makefile.unx | 2 +- samples/regtest/makefile.vc | 647 +++---- samples/regtest/makefile.wat | 520 +++--- samples/regtest/regtest.dsp | 16 +- samples/regtest/regtest_vc7.vcproj | 26 +- samples/regtest/regtest_vc8.vcproj | 18 +- samples/regtest/regtest_vc9.vcproj | 34 +- samples/render/Makefile.in | 2 +- samples/render/makefile.bcc | 522 +++--- samples/render/makefile.gcc | 498 ++--- samples/render/makefile.unx | 2 +- samples/render/makefile.vc | 728 ++++---- samples/render/makefile.wat | 584 +++--- samples/render/render_renddll.dsp | 8 +- samples/render/render_render.dsp | 16 +- samples/render/render_vc7_renddll.vcproj | 14 +- samples/render/render_vc7_render.vcproj | 26 +- samples/render/render_vc8_renddll.vcproj | 10 +- samples/render/render_vc8_render.vcproj | 18 +- samples/render/render_vc9_renddll.vcproj | 18 +- samples/render/render_vc9_render.vcproj | 34 +- samples/ribbon/Makefile.in | 2 +- samples/ribbon/makefile.bcc | 480 ++--- samples/ribbon/makefile.gcc | 468 ++--- samples/ribbon/makefile.unx | 2 +- samples/ribbon/makefile.vc | 663 +++---- samples/ribbon/makefile.wat | 540 +++--- samples/ribbon/ribbon.dsp | 16 +- samples/ribbon/ribbon_vc7.vcproj | 26 +- samples/ribbon/ribbon_vc8.vcproj | 18 +- samples/ribbon/ribbon_vc9.vcproj | 34 +- samples/richtext/Makefile.in | 2 +- samples/richtext/makefile.bcc | 496 ++--- samples/richtext/makefile.gcc | 484 ++--- samples/richtext/makefile.unx | 2 +- samples/richtext/makefile.vc | 679 +++---- samples/richtext/makefile.wat | 560 +++--- samples/richtext/richtext.dsp | 16 +- samples/richtext/richtext_vc7.vcproj | 26 +- samples/richtext/richtext_vc8.vcproj | 18 +- samples/richtext/richtext_vc9.vcproj | 34 +- samples/sashtest/Makefile.in | 2 +- samples/sashtest/makefile.bcc | 472 ++--- samples/sashtest/makefile.gcc | 460 ++--- samples/sashtest/makefile.unx | 2 +- samples/sashtest/makefile.vc | 655 +++---- samples/sashtest/makefile.wat | 530 +++--- samples/sashtest/sashtest.dsp | 16 +- samples/sashtest/sashtest_vc7.vcproj | 26 +- samples/sashtest/sashtest_vc8.vcproj | 18 +- samples/sashtest/sashtest_vc9.vcproj | 34 +- samples/scroll/Makefile.in | 2 +- samples/scroll/makefile.bcc | 464 ++--- samples/scroll/makefile.gcc | 452 ++--- samples/scroll/makefile.unx | 2 +- samples/scroll/makefile.vc | 647 +++---- samples/scroll/makefile.wat | 520 +++--- samples/scroll/scroll.dsp | 16 +- samples/scroll/scroll_vc7.vcproj | 26 +- samples/scroll/scroll_vc8.vcproj | 18 +- samples/scroll/scroll_vc9.vcproj | 34 +- samples/shaped/Makefile.in | 2 +- samples/shaped/makefile.bcc | 472 ++--- samples/shaped/makefile.gcc | 460 ++--- samples/shaped/makefile.unx | 2 +- samples/shaped/makefile.vc | 655 +++---- samples/shaped/makefile.wat | 528 +++--- samples/shaped/shaped.dsp | 16 +- samples/shaped/shaped_vc7.vcproj | 26 +- samples/shaped/shaped_vc8.vcproj | 18 +- samples/shaped/shaped_vc9.vcproj | 34 +- samples/sockets/Makefile.in | 2 +- samples/sockets/makefile.bcc | 630 +++---- samples/sockets/makefile.gcc | 584 +++--- samples/sockets/makefile.unx | 2 +- samples/sockets/makefile.vc | 882 +++++---- samples/sockets/makefile.wat | 706 +++---- samples/sockets/sockets_baseclient.dsp | 16 +- samples/sockets/sockets_baseserver.dsp | 16 +- samples/sockets/sockets_client.dsp | 16 +- samples/sockets/sockets_server.dsp | 16 +- samples/sockets/sockets_vc7_baseclient.vcproj | 26 +- samples/sockets/sockets_vc7_baseserver.vcproj | 26 +- samples/sockets/sockets_vc7_client.vcproj | 26 +- samples/sockets/sockets_vc7_server.vcproj | 26 +- samples/sockets/sockets_vc8_baseclient.vcproj | 18 +- samples/sockets/sockets_vc8_baseserver.vcproj | 18 +- samples/sockets/sockets_vc8_client.vcproj | 18 +- samples/sockets/sockets_vc8_server.vcproj | 18 +- samples/sockets/sockets_vc9_baseclient.vcproj | 34 +- samples/sockets/sockets_vc9_baseserver.vcproj | 34 +- samples/sockets/sockets_vc9_client.vcproj | 34 +- samples/sockets/sockets_vc9_server.vcproj | 34 +- samples/sound/Makefile.in | 2 +- samples/sound/makefile.bcc | 480 ++--- samples/sound/makefile.gcc | 468 ++--- samples/sound/makefile.unx | 2 +- samples/sound/makefile.vc | 663 +++---- samples/sound/makefile.wat | 538 +++--- samples/sound/sound.dsp | 16 +- samples/sound/sound_vc7.vcproj | 26 +- samples/sound/sound_vc8.vcproj | 18 +- samples/sound/sound_vc9.vcproj | 34 +- samples/splash/Makefile.in | 2 +- samples/splash/makefile.bcc | 488 ++--- samples/splash/makefile.gcc | 480 ++--- samples/splash/makefile.unx | 2 +- samples/splash/makefile.vc | 671 +++---- samples/splash/makefile.wat | 552 +++--- samples/splash/splash.dsp | 16 +- samples/splash/splash_vc7.vcproj | 26 +- samples/splash/splash_vc8.vcproj | 18 +- samples/splash/splash_vc9.vcproj | 34 +- samples/splitter/Makefile.in | 2 +- samples/splitter/makefile.bcc | 464 ++--- samples/splitter/makefile.gcc | 452 ++--- samples/splitter/makefile.unx | 2 +- samples/splitter/makefile.vc | 647 +++---- samples/splitter/makefile.wat | 520 +++--- samples/splitter/splitter.dsp | 16 +- samples/splitter/splitter_vc7.vcproj | 26 +- samples/splitter/splitter_vc8.vcproj | 18 +- samples/splitter/splitter_vc9.vcproj | 34 +- samples/statbar/Makefile.in | 2 +- samples/statbar/makefile.bcc | 464 ++--- samples/statbar/makefile.gcc | 452 ++--- samples/statbar/makefile.unx | 2 +- samples/statbar/makefile.vc | 647 +++---- samples/statbar/makefile.wat | 520 +++--- samples/statbar/statbar.dsp | 16 +- samples/statbar/statbar_vc7.vcproj | 26 +- samples/statbar/statbar_vc8.vcproj | 18 +- samples/statbar/statbar_vc9.vcproj | 34 +- samples/stc/Makefile.in | 2 +- samples/stc/makefile.bcc | 496 ++--- samples/stc/makefile.gcc | 484 ++--- samples/stc/makefile.unx | 2 +- samples/stc/makefile.vc | 679 +++---- samples/stc/makefile.wat | 554 +++--- samples/stc/stctest.dsp | 16 +- samples/stc/stctest_vc7.vcproj | 26 +- samples/stc/stctest_vc8.vcproj | 18 +- samples/stc/stctest_vc9.vcproj | 34 +- samples/svg/Makefile.in | 2 +- samples/svg/makefile.bcc | 464 ++--- samples/svg/makefile.gcc | 452 ++--- samples/svg/makefile.unx | 2 +- samples/svg/makefile.vc | 647 +++---- samples/svg/makefile.wat | 520 +++--- samples/svg/svgtest.dsp | 16 +- samples/svg/svgtest_vc7.vcproj | 26 +- samples/svg/svgtest_vc8.vcproj | 18 +- samples/svg/svgtest_vc9.vcproj | 34 +- samples/taborder/Makefile.in | 2 +- samples/taborder/makefile.bcc | 464 ++--- samples/taborder/makefile.gcc | 452 ++--- samples/taborder/makefile.unx | 2 +- samples/taborder/makefile.vc | 647 +++---- samples/taborder/makefile.wat | 520 +++--- samples/taborder/taborder.dsp | 16 +- samples/taborder/taborder_vc7.vcproj | 26 +- samples/taborder/taborder_vc8.vcproj | 18 +- samples/taborder/taborder_vc9.vcproj | 34 +- samples/taskbar/Makefile.in | 2 +- samples/taskbar/makefile.bcc | 472 ++--- samples/taskbar/makefile.gcc | 460 ++--- samples/taskbar/makefile.unx | 2 +- samples/taskbar/makefile.vc | 655 +++---- samples/taskbar/makefile.wat | 530 +++--- samples/taskbar/taskbar.dsp | 16 +- samples/taskbar/taskbar_vc7.vcproj | 26 +- samples/taskbar/taskbar_vc8.vcproj | 18 +- samples/taskbar/taskbar_vc9.vcproj | 34 +- samples/text/Makefile.in | 2 +- samples/text/makefile.bcc | 464 ++--- samples/text/makefile.gcc | 452 ++--- samples/text/makefile.unx | 2 +- samples/text/makefile.vc | 647 +++---- samples/text/makefile.wat | 520 +++--- samples/text/text.dsp | 16 +- samples/text/text_vc7.vcproj | 26 +- samples/text/text_vc8.vcproj | 18 +- samples/text/text_vc9.vcproj | 34 +- samples/thread/Makefile.in | 2 +- samples/thread/makefile.bcc | 464 ++--- samples/thread/makefile.gcc | 452 ++--- samples/thread/makefile.unx | 2 +- samples/thread/makefile.vc | 647 +++---- samples/thread/makefile.wat | 520 +++--- samples/thread/thread.dsp | 16 +- samples/thread/thread_vc7.vcproj | 26 +- samples/thread/thread_vc8.vcproj | 18 +- samples/thread/thread_vc9.vcproj | 34 +- samples/toolbar/Makefile.in | 2 +- samples/toolbar/makefile.bcc | 464 ++--- samples/toolbar/makefile.gcc | 452 ++--- samples/toolbar/makefile.unx | 2 +- samples/toolbar/makefile.vc | 647 +++---- samples/toolbar/makefile.wat | 520 +++--- samples/toolbar/toolbar.dsp | 16 +- samples/toolbar/toolbar_vc7.vcproj | 26 +- samples/toolbar/toolbar_vc8.vcproj | 18 +- samples/toolbar/toolbar_vc9.vcproj | 34 +- samples/treectrl/Makefile.in | 2 +- samples/treectrl/makefile.bcc | 464 ++--- samples/treectrl/makefile.gcc | 452 ++--- samples/treectrl/makefile.unx | 2 +- samples/treectrl/makefile.vc | 647 +++---- samples/treectrl/makefile.wat | 520 +++--- samples/treectrl/treectrl.dsp | 16 +- samples/treectrl/treectrl_vc7.vcproj | 26 +- samples/treectrl/treectrl_vc8.vcproj | 18 +- samples/treectrl/treectrl_vc9.vcproj | 34 +- samples/typetest/Makefile.in | 2 +- samples/typetest/makefile.bcc | 464 ++--- samples/typetest/makefile.gcc | 452 ++--- samples/typetest/makefile.unx | 2 +- samples/typetest/makefile.vc | 647 +++---- samples/typetest/makefile.wat | 520 +++--- samples/typetest/typetest.dsp | 16 +- samples/typetest/typetest_vc7.vcproj | 26 +- samples/typetest/typetest_vc8.vcproj | 18 +- samples/typetest/typetest_vc9.vcproj | 34 +- samples/validate/Makefile.in | 2 +- samples/validate/makefile.bcc | 464 ++--- samples/validate/makefile.gcc | 452 ++--- samples/validate/makefile.unx | 2 +- samples/validate/makefile.vc | 647 +++---- samples/validate/makefile.wat | 520 +++--- samples/validate/validate.dsp | 16 +- samples/validate/validate_vc7.vcproj | 26 +- samples/validate/validate_vc8.vcproj | 18 +- samples/validate/validate_vc9.vcproj | 34 +- samples/vscroll/Makefile.in | 2 +- samples/vscroll/makefile.bcc | 464 ++--- samples/vscroll/makefile.gcc | 452 ++--- samples/vscroll/makefile.unx | 2 +- samples/vscroll/makefile.vc | 647 +++---- samples/vscroll/makefile.wat | 520 +++--- samples/vscroll/vscroll.dsp | 16 +- samples/vscroll/vscroll_vc7.vcproj | 26 +- samples/vscroll/vscroll_vc8.vcproj | 18 +- samples/vscroll/vscroll_vc9.vcproj | 34 +- samples/widgets/Makefile.in | 2 +- samples/widgets/makefile.bcc | 688 +++---- samples/widgets/makefile.gcc | 676 +++---- samples/widgets/makefile.unx | 2 +- samples/widgets/makefile.vc | 871 ++++----- samples/widgets/makefile.wat | 746 ++++---- samples/widgets/widgets.dsp | 16 +- samples/widgets/widgets_vc7.vcproj | 26 +- samples/widgets/widgets_vc8.vcproj | 18 +- samples/widgets/widgets_vc9.vcproj | 34 +- samples/wizard/Makefile.in | 2 +- samples/wizard/makefile.bcc | 472 ++--- samples/wizard/makefile.gcc | 460 ++--- samples/wizard/makefile.unx | 2 +- samples/wizard/makefile.vc | 655 +++---- samples/wizard/makefile.wat | 530 +++--- samples/wizard/wizard.dsp | 16 +- samples/wizard/wizard_vc7.vcproj | 26 +- samples/wizard/wizard_vc8.vcproj | 18 +- samples/wizard/wizard_vc9.vcproj | 34 +- samples/wrapsizer/Makefile.in | 2 +- samples/wrapsizer/makefile.bcc | 464 ++--- samples/wrapsizer/makefile.gcc | 452 ++--- samples/wrapsizer/makefile.unx | 2 +- samples/wrapsizer/makefile.vc | 647 +++---- samples/wrapsizer/makefile.wat | 520 +++--- samples/wrapsizer/wrapsizer.dsp | 16 +- samples/wrapsizer/wrapsizer_vc7.vcproj | 26 +- samples/wrapsizer/wrapsizer_vc8.vcproj | 18 +- samples/wrapsizer/wrapsizer_vc9.vcproj | 34 +- samples/xrc/Makefile.in | 2 +- samples/xrc/makefile.bcc | 528 +++--- samples/xrc/makefile.gcc | 516 +++--- samples/xrc/makefile.unx | 2 +- samples/xrc/makefile.vc | 711 +++---- samples/xrc/makefile.wat | 592 +++--- samples/xrc/xrcdemo.dsp | 16 +- samples/xrc/xrcdemo_vc7.vcproj | 26 +- samples/xrc/xrcdemo_vc8.vcproj | 18 +- samples/xrc/xrcdemo_vc9.vcproj | 34 +- tests/Makefile.in | 2 +- tests/benchmarks/Makefile.in | 2 +- tests/benchmarks/bench.dsp | 16 +- tests/benchmarks/bench_vc7.vcproj | 26 +- tests/benchmarks/bench_vc8.vcproj | 18 +- tests/benchmarks/bench_vc9.vcproj | 34 +- tests/benchmarks/makefile.bcc | 444 ++--- tests/benchmarks/makefile.gcc | 430 ++--- tests/benchmarks/makefile.vc | 588 +++--- tests/benchmarks/makefile.wat | 552 +++--- tests/makefile.bcc | 20 +- tests/makefile.gcc | 22 +- tests/makefile.vc | 108 +- tests/makefile.wat | 24 +- tests/test_test.dsp | 32 +- tests/test_test_gui.dsp | 24 +- tests/test_vc7_test.vcproj | 38 +- tests/test_vc7_test_gui.vcproj | 32 +- tests/test_vc8_test.vcproj | 34 +- tests/test_vc8_test_gui.vcproj | 26 +- tests/test_vc9_test.vcproj | 50 +- tests/test_vc9_test_gui.vcproj | 42 +- utils/Makefile.in | 2 +- utils/emulator/src/Makefile.in | 2 +- utils/emulator/src/emulator.dsp | 16 +- utils/emulator/src/emulator_vc7.vcproj | 26 +- utils/emulator/src/emulator_vc8.vcproj | 18 +- utils/emulator/src/emulator_vc9.vcproj | 34 +- utils/emulator/src/makefile.bcc | 472 ++--- utils/emulator/src/makefile.gcc | 460 ++--- utils/emulator/src/makefile.vc | 655 +++---- utils/emulator/src/makefile.wat | 528 +++--- utils/execmon/Makefile.in | 2 +- utils/execmon/execmon.dsp | 16 +- utils/execmon/execmon_vc7.vcproj | 26 +- utils/execmon/execmon_vc8.vcproj | 18 +- utils/execmon/execmon_vc9.vcproj | 34 +- utils/execmon/makefile.bcc | 382 ++-- utils/execmon/makefile.gcc | 368 ++-- utils/execmon/makefile.vc | 526 +++--- utils/execmon/makefile.wat | 490 ++--- utils/helpview/src/Makefile.in | 2 +- utils/helpview/src/helpview.dsp | 16 +- utils/helpview/src/helpview_vc7.vcproj | 26 +- utils/helpview/src/helpview_vc8.vcproj | 18 +- utils/helpview/src/helpview_vc9.vcproj | 34 +- utils/helpview/src/makefile.bcc | 488 ++--- utils/helpview/src/makefile.gcc | 476 ++--- utils/helpview/src/makefile.vc | 671 +++---- utils/helpview/src/makefile.wat | 548 +++--- utils/hhp2cached/Makefile.in | 2 +- utils/hhp2cached/hhp2cached.dsp | 16 +- utils/hhp2cached/hhp2cached_vc7.vcproj | 26 +- utils/hhp2cached/hhp2cached_vc8.vcproj | 18 +- utils/hhp2cached/hhp2cached_vc9.vcproj | 34 +- utils/hhp2cached/makefile.bcc | 472 ++--- utils/hhp2cached/makefile.gcc | 460 ++--- utils/hhp2cached/makefile.vc | 655 +++---- utils/hhp2cached/makefile.wat | 530 +++--- utils/ifacecheck/src/Makefile.in | 2 +- utils/ifacecheck/src/ifacecheck.dsp | 16 +- utils/ifacecheck/src/ifacecheck_vc7.vcproj | 26 +- utils/ifacecheck/src/ifacecheck_vc8.vcproj | 18 +- utils/ifacecheck/src/ifacecheck_vc9.vcproj | 34 +- utils/ifacecheck/src/makefile.bcc | 388 ++-- utils/ifacecheck/src/makefile.gcc | 374 ++-- utils/ifacecheck/src/makefile.vc | 532 +++--- utils/ifacecheck/src/makefile.wat | 498 ++--- utils/makefile.bcc | 246 +-- utils/makefile.gcc | 160 +- utils/makefile.vc | 200 +- utils/makefile.wat | 240 +-- utils/screenshotgen/src/Makefile.in | 2 +- utils/screenshotgen/src/makefile.bcc | 552 +++--- utils/screenshotgen/src/makefile.gcc | 540 +++--- utils/screenshotgen/src/makefile.vc | 735 ++++---- utils/screenshotgen/src/makefile.wat | 618 +++---- utils/screenshotgen/src/screenshotgen.dsp | 16 +- .../src/screenshotgen_vc7.vcproj | 26 +- .../src/screenshotgen_vc8.vcproj | 18 +- .../src/screenshotgen_vc9.vcproj | 34 +- utils/wxrc/Makefile.in | 2 +- utils/wxrc/makefile.bcc | 390 ++-- utils/wxrc/makefile.gcc | 376 ++-- utils/wxrc/makefile.vc | 534 +++--- utils/wxrc/makefile.wat | 500 ++--- utils/wxrc/wxrc.dsp | 16 +- utils/wxrc/wxrc_vc7.vcproj | 26 +- utils/wxrc/wxrc_vc8.vcproj | 18 +- utils/wxrc/wxrc_vc9.vcproj | 34 +- wxGTK.spec | 1 + wxMotif.spec | 1 + wxX11.spec | 1 + 1161 files changed, 124949 insertions(+), 119031 deletions(-) diff --git a/Makefile.in b/Makefile.in index 48d0fa717e..9c96f23998 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -622,6 +622,7 @@ ALL_PORTS_BASE_HEADERS = \ wx/unix/apptrait.h \ wx/unix/chkconf.h \ wx/unix/evtloop.h \ + wx/unix/evtloopsrc.h \ wx/unix/pipe.h \ wx/unix/stdpaths.h \ wx/unix/stackwalk.h \ @@ -2195,6 +2196,7 @@ COND_TOOLKIT__BASE_OSX_HDR = \ wx/unix/apptrait.h \ wx/unix/chkconf.h \ wx/unix/evtloop.h \ + wx/unix/evtloopsrc.h \ wx/unix/pipe.h \ wx/unix/stdpaths.h \ wx/unix/stackwalk.h \ @@ -2216,6 +2218,7 @@ COND_TOOLKIT_COCOA_BASE_OSX_HDR = \ wx/unix/apptrait.h \ wx/unix/chkconf.h \ wx/unix/evtloop.h \ + wx/unix/evtloopsrc.h \ wx/unix/pipe.h \ wx/unix/stdpaths.h \ wx/unix/stackwalk.h \ @@ -2237,6 +2240,7 @@ COND_TOOLKIT_GTK_BASE_OSX_HDR = \ wx/unix/apptrait.h \ wx/unix/chkconf.h \ wx/unix/evtloop.h \ + wx/unix/evtloopsrc.h \ wx/unix/pipe.h \ wx/unix/stdpaths.h \ wx/unix/stackwalk.h \ @@ -2258,6 +2262,7 @@ COND_TOOLKIT_MOTIF_BASE_OSX_HDR = \ wx/unix/apptrait.h \ wx/unix/chkconf.h \ wx/unix/evtloop.h \ + wx/unix/evtloopsrc.h \ wx/unix/pipe.h \ wx/unix/stdpaths.h \ wx/unix/stackwalk.h \ @@ -2286,6 +2291,7 @@ COND_TOOLKIT_OSX_CARBON_BASE_OSX_HDR = \ wx/unix/apptrait.h \ wx/unix/chkconf.h \ wx/unix/evtloop.h \ + wx/unix/evtloopsrc.h \ wx/unix/pipe.h \ wx/unix/stdpaths.h \ wx/unix/stackwalk.h \ @@ -2305,6 +2311,7 @@ COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR = \ wx/unix/apptrait.h \ wx/unix/chkconf.h \ wx/unix/evtloop.h \ + wx/unix/evtloopsrc.h \ wx/unix/pipe.h \ wx/unix/stdpaths.h \ wx/unix/stackwalk.h \ @@ -2317,6 +2324,7 @@ COND_TOOLKIT_X11_BASE_OSX_HDR = \ wx/unix/apptrait.h \ wx/unix/chkconf.h \ wx/unix/evtloop.h \ + wx/unix/evtloopsrc.h \ wx/unix/pipe.h \ wx/unix/stdpaths.h \ wx/unix/stackwalk.h \ @@ -2351,6 +2359,7 @@ COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR = \ wx/unix/apptrait.h \ wx/unix/chkconf.h \ wx/unix/evtloop.h \ + wx/unix/evtloopsrc.h \ wx/unix/pipe.h \ wx/unix/stdpaths.h \ wx/unix/stackwalk.h \ @@ -2466,6 +2475,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_LOWLEVEL_HDR = \ wx/gtk/dcscreen.h \ wx/gtk/dnd.h \ wx/gtk/evtloop.h \ + wx/gtk/evtloopsrc.h \ wx/gtk/font.h \ wx/gtk/minifram.h \ wx/gtk/pen.h \ @@ -2974,6 +2984,7 @@ COND_TOOLKIT_OSX_CARBON_GUI_HDR = \ wx/osx/dirdlg.h \ wx/osx/dnd.h \ wx/osx/evtloop.h \ + wx/osx/evtloopsrc.h \ wx/osx/filedlg.h \ wx/osx/font.h \ wx/osx/fontdlg.h \ @@ -3077,6 +3088,7 @@ COND_TOOLKIT_OSX_COCOA_GUI_HDR = \ wx/osx/dirdlg.h \ wx/osx/dnd.h \ wx/osx/evtloop.h \ + wx/osx/evtloopsrc.h \ wx/osx/filedlg.h \ wx/osx/font.h \ wx/osx/fontdlg.h \ @@ -3710,6 +3722,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/docview.h \ wx/effects.h \ wx/evtloop.h \ + wx/evtloopsrc.h \ wx/fdrepdlg.h \ wx/filectrl.h \ wx/filepicker.h \ @@ -13030,7 +13043,7 @@ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__instal $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets - (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl $(DESTDIR)$(datadir)/bakefile/presets) + (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets) $(DYLIB_RPATH_INSTALL) $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx for f in setup.h $(RCDEFS_H); do \ @@ -13064,7 +13077,7 @@ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__instal uninstall: $(__uninstall_wxregex___depname) $(__uninstall_wxzlib___depname) $(__uninstall_wxpng___depname) $(__uninstall_wxjpeg___depname) $(__uninstall_wxtiff___depname) $(__uninstall_wxexpat___depname) $(__uninstall_wxscintilla___depname) $(__uninstall_monodll___depname) $(__uninstall_monolib___depname) $(__uninstall_basedll___depname) $(__uninstall_baselib___depname) $(__uninstall_netdll___depname) $(__uninstall_netlib___depname) $(__uninstall_coredll___depname) $(__uninstall_corelib___depname) $(__uninstall_advdll___depname) $(__uninstall_advlib___depname) $(__uninstall_mediadll___depname) $(__uninstall_medialib___depname) $(__uninstall_htmldll___depname) $(__uninstall_htmllib___depname) $(__uninstall_qadll___depname) $(__uninstall_qalib___depname) $(__uninstall_xmldll___depname) $(__uninstall_xmllib___depname) $(__uninstall_xrcdll___depname) $(__uninstall_xrclib___depname) $(__uninstall_auidll___depname) $(__uninstall_auilib___depname) $(__uninstall_ribbondll___depname) $(__uninstall_ribbonlib___depname) $(__uninstall_propgriddll___depname) $(__uninstall_propgridlib___depname) $(__uninstall_richtextdll___depname) $(__uninstall_richtextlib___depname) $(__uninstall_stcdll___depname) $(__uninstall_stclib___depname) $(__uninstall_gldll___depname) $(__uninstall_gllib___depname) $(__uninstall_sound_sdl___depname) locale_uninstall locale_msw_uninstall (cd $(DESTDIR)$(datadir)/aclocal ; rm -f wxwin.m4) - (cd $(DESTDIR)$(datadir)/bakefile/presets ; rm -f wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl) + (cd $(DESTDIR)$(datadir)/bakefile/presets ; rm -f wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py) for f in setup.h $(RCDEFS_H); do \ rm -f $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f; \ done diff --git a/autoconf_inc.m4 b/autoconf_inc.m4 index 4994b76b33..fb0e71a163 100644 --- a/autoconf_inc.m4 +++ b/autoconf_inc.m4 @@ -1,10 +1,10 @@ dnl ### begin block 00_header[../../demos/bombs/bombs.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/editlbox/editlbox.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/flash/flash.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mahogany/mahogany.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/mobile_samples.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/mahogany.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/ifacecheck.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ### dnl dnl This macro was generated by -dnl Bakefile 0.2.6 (http://www.bakefile.org) +dnl Bakefile 0.2.7 (http://www.bakefile.org) dnl Do not modify, all changes will be overwritten! -BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.6" +BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.7" dnl ### begin block 10_AC_BAKEFILE_PRECOMP_HEADERS[../../tests/test.bkl,wx.bkl] ### AC_BAKEFILE_PRECOMP_HEADERS diff --git a/build/aclocal/bakefile-lang.m4 b/build/aclocal/bakefile-lang.m4 index 019724a03f..4cc4a679ee 100644 --- a/build/aclocal/bakefile-lang.m4 +++ b/build/aclocal/bakefile-lang.m4 @@ -21,7 +21,7 @@ dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER dnl DEALINGS IN THE SOFTWARE. dnl -dnl $Id$ +dnl $Id: bakefile-lang.m4 1278 2008-11-17 22:26:10Z vadz $ dnl dnl Compiler detection macros by David Elliott and Vadim Zeitlin dnl diff --git a/build/aclocal/bakefile.m4 b/build/aclocal/bakefile.m4 index 8f3d11fbdf..a9b644ac4a 100644 --- a/build/aclocal/bakefile.m4 +++ b/build/aclocal/bakefile.m4 @@ -21,7 +21,7 @@ dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER dnl DEALINGS IN THE SOFTWARE. dnl -dnl $Id$ +dnl $Id: bakefile.m4 1322 2009-10-21 07:37:18Z vaclavslavik $ dnl dnl Support macros for makefiles generated by BAKEFILE. dnl @@ -337,7 +337,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD], chmod +x shared-ld-sh SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o" - SHARED_LD_MODULE_CXX="CXX=\$(CXX) $SHARED_LD_MODULE_CC" + SHARED_LD_MODULE_CXX="CXX=\"\$(CXX)\" $SHARED_LD_MODULE_CC" dnl Most apps benefit from being fully binded (its faster and static dnl variables initialized at startup work). @@ -838,7 +838,7 @@ AC_DEFUN([AC_BAKEFILE], AC_SUBST(OBJCXXFLAGS) - BAKEFILE_BAKEFILE_M4_VERSION="0.2.6" + BAKEFILE_BAKEFILE_M4_VERSION="0.2.7" dnl includes autoconf_inc.m4: $1 diff --git a/build/msw/config.bcc b/build/msw/config.bcc index cc29b1b9b1..923f0ac527 100644 --- a/build/msw/config.bcc +++ b/build/msw/config.bcc @@ -1,212 +1,212 @@ -# ========================================================================= -# This configuration file was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Beware that all changes made to this file will be overwritten next -# time you run Bakefile! -# ========================================================================= - - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# C compiler -!ifndef CC -CC = bcc32 -!endif - -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif - -# Standard flags for CC -!ifndef CFLAGS -CFLAGS = -!endif - -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif - -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a8 -g0 -!endif - -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif - -# The C preprocessor -!ifndef CPP -CPP = cpp32 -Sr -oCON -!endif - -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 0 -!endif - -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif - -# Compile Unicode build of wxWidgets? [0,1] -!ifndef UNICODE -UNICODE = 1 -!endif - -# Use MSLU library when building Unicode version. [0,1] -!ifndef MSLU -MSLU = 0 -!endif - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = debug -!endif - -# Should debugging info be included in the executables? The default value -# "default" means that debug info will be included if BUILD=debug -# and not included if BUILD=release. [0,1,default] -!ifndef DEBUG_INFO -DEBUG_INFO = default -!endif - -# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all -# but expensive assert checks are enabled, use 0 to completely remove debugging -# code. [0,1,default] -!ifndef DEBUG_FLAG -DEBUG_FLAG = 1 -!endif - -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 0 -!endif - -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif - -# Build wxHTML library (USE_GUI must be 1)? [0,1] -!ifndef USE_HTML -USE_HTML = 1 -!endif - -# Build multimedia library (USE_GUI must be 1)? [0,1] -!ifndef USE_MEDIA -USE_MEDIA = 1 -!endif - -# Build wxXRC library (USE_GUI must be 1)? [0,1] -!ifndef USE_XRC -USE_XRC = 1 -!endif - -# Build wxAUI library (USE_GUI must be 1)? [0,1] -!ifndef USE_AUI -USE_AUI = 1 -!endif - -# Build wxRibbon library (USE_GUI must be 1)? [0,1] -!ifndef USE_RIBBON -USE_RIBBON = 1 -!endif - -# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1] -!ifndef USE_PROPGRID -USE_PROPGRID = 1 -!endif - -# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1] -!ifndef USE_RICHTEXT -USE_RICHTEXT = 1 -!endif - -# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1] -!ifndef USE_STC -USE_STC = 1 -!endif - -# Build OpenGL canvas library (USE_GUI must be 1)? [0,1] -!ifndef USE_OPENGL -USE_OPENGL = 1 -!endif - -# Build quality assurance classes library (USE_GUI must be 1)? [0,1] -!ifndef USE_QA -USE_QA = 0 -!endif - -# Enable exceptions in compiled code. [0,1] -!ifndef USE_EXCEPTIONS -USE_EXCEPTIONS = 1 -!endif - -# Enable run-time type information (RTTI) in compiled code. [0,1] -!ifndef USE_RTTI -USE_RTTI = 1 -!endif - -# Enable threading in compiled code. [0,1] -!ifndef USE_THREADS -USE_THREADS = 1 -!endif - -# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1] -!ifndef USE_GDIPLUS -USE_GDIPLUS = 0 -!endif - -# Is this official build by wxWidgets developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif - -# Use this to name your customized DLLs differently -!ifndef VENDOR -VENDOR = custom -!endif - -# -!ifndef WX_FLAVOUR -WX_FLAVOUR = -!endif - -# -!ifndef WX_LIB_FLAVOUR -WX_LIB_FLAVOUR = -!endif - -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif - -# Compiler flags needed to compile test suite in tests directory. If you want -# to run the tests, set it so that the compiler can find CppUnit headers. -!ifndef CPPUNIT_CFLAGS -CPPUNIT_CFLAGS = -!endif - -# Linker flags needed to link test suite in tests directory. If you want -# to run the tests, include CppUnit library here. -!ifndef CPPUNIT_LIBS -CPPUNIT_LIBS = -!endif - -# Version of C runtime library to use. You can change this to -# static if SHARED=0, but it is highly recommended to not do -# it if SHARED=1 unless you know what you are doing. [dynamic,static] -!ifndef RUNTIME_LIBS -RUNTIME_LIBS = dynamic -!endif - +# ========================================================================= +# This configuration file was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Beware that all changes made to this file will be overwritten next +# time you run Bakefile! +# ========================================================================= + + +# ------------------------------------------------------------------------- +# These are configurable options: +# ------------------------------------------------------------------------- + +# C compiler +!ifndef CC +CC = bcc32 +!endif + +# C++ compiler +!ifndef CXX +CXX = bcc32 +!endif + +# Standard flags for CC +!ifndef CFLAGS +CFLAGS = +!endif + +# Standard flags for C++ +!ifndef CXXFLAGS +CXXFLAGS = +!endif + +# Standard preprocessor flags (common for CC and CXX) +!ifndef CPPFLAGS +CPPFLAGS = -a8 -g0 +!endif + +# Standard linker flags +!ifndef LDFLAGS +LDFLAGS = +!endif + +# The C preprocessor +!ifndef CPP +CPP = cpp32 -Sr -oCON +!endif + +# What type of library to build? [0,1] +!ifndef SHARED +SHARED = 0 +!endif + +# Build wxUniversal instead of native port? [0,1] +!ifndef WXUNIV +WXUNIV = 0 +!endif + +# Compile Unicode build of wxWidgets? [0,1] +!ifndef UNICODE +UNICODE = 1 +!endif + +# Use MSLU library when building Unicode version. [0,1] +!ifndef MSLU +MSLU = 0 +!endif + +# Type of compiled binaries [debug,release] +!ifndef BUILD +BUILD = debug +!endif + +# Should debugging info be included in the executables? The default value +# "default" means that debug info will be included if BUILD=debug +# and not included if BUILD=release. [0,1,default] +!ifndef DEBUG_INFO +DEBUG_INFO = default +!endif + +# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all +# but expensive assert checks are enabled, use 0 to completely remove debugging +# code. [0,1,default] +!ifndef DEBUG_FLAG +DEBUG_FLAG = 1 +!endif + +# Multiple libraries or single huge monolithic one? [0,1] +!ifndef MONOLITHIC +MONOLITHIC = 0 +!endif + +# Build GUI libraries? [0,1] +!ifndef USE_GUI +USE_GUI = 1 +!endif + +# Build wxHTML library (USE_GUI must be 1)? [0,1] +!ifndef USE_HTML +USE_HTML = 1 +!endif + +# Build multimedia library (USE_GUI must be 1)? [0,1] +!ifndef USE_MEDIA +USE_MEDIA = 1 +!endif + +# Build wxXRC library (USE_GUI must be 1)? [0,1] +!ifndef USE_XRC +USE_XRC = 1 +!endif + +# Build wxAUI library (USE_GUI must be 1)? [0,1] +!ifndef USE_AUI +USE_AUI = 1 +!endif + +# Build wxRibbon library (USE_GUI must be 1)? [0,1] +!ifndef USE_RIBBON +USE_RIBBON = 1 +!endif + +# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1] +!ifndef USE_PROPGRID +USE_PROPGRID = 1 +!endif + +# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1] +!ifndef USE_RICHTEXT +USE_RICHTEXT = 1 +!endif + +# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1] +!ifndef USE_STC +USE_STC = 1 +!endif + +# Build OpenGL canvas library (USE_GUI must be 1)? [0,1] +!ifndef USE_OPENGL +USE_OPENGL = 1 +!endif + +# Build quality assurance classes library (USE_GUI must be 1)? [0,1] +!ifndef USE_QA +USE_QA = 0 +!endif + +# Enable exceptions in compiled code. [0,1] +!ifndef USE_EXCEPTIONS +USE_EXCEPTIONS = 1 +!endif + +# Enable run-time type information (RTTI) in compiled code. [0,1] +!ifndef USE_RTTI +USE_RTTI = 1 +!endif + +# Enable threading in compiled code. [0,1] +!ifndef USE_THREADS +USE_THREADS = 1 +!endif + +# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1] +!ifndef USE_GDIPLUS +USE_GDIPLUS = 0 +!endif + +# Is this official build by wxWidgets developers? [0,1] +!ifndef OFFICIAL_BUILD +OFFICIAL_BUILD = 0 +!endif + +# Use this to name your customized DLLs differently +!ifndef VENDOR +VENDOR = custom +!endif + +# +!ifndef WX_FLAVOUR +WX_FLAVOUR = +!endif + +# +!ifndef WX_LIB_FLAVOUR +WX_LIB_FLAVOUR = +!endif + +# Name of your custom configuration. This affects directory +# where object files are stored as well as the location of +# compiled .lib files and setup.h under the lib/ toplevel directory. +!ifndef CFG +CFG = +!endif + +# Compiler flags needed to compile test suite in tests directory. If you want +# to run the tests, set it so that the compiler can find CppUnit headers. +!ifndef CPPUNIT_CFLAGS +CPPUNIT_CFLAGS = +!endif + +# Linker flags needed to link test suite in tests directory. If you want +# to run the tests, include CppUnit library here. +!ifndef CPPUNIT_LIBS +CPPUNIT_LIBS = +!endif + +# Version of C runtime library to use. You can change this to +# static if SHARED=0, but it is highly recommended to not do +# it if SHARED=1 unless you know what you are doing. [dynamic,static] +!ifndef RUNTIME_LIBS +RUNTIME_LIBS = dynamic +!endif + diff --git a/build/msw/config.gcc b/build/msw/config.gcc index 3dbf94ba48..2acccb6fba 100644 --- a/build/msw/config.gcc +++ b/build/msw/config.gcc @@ -1,147 +1,147 @@ -# ========================================================================= -# This configuration file was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Beware that all changes made to this file will be overwritten next -# time you run Bakefile! -# ========================================================================= - - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Compiler flags to link shared library -LINK_DLL_FLAGS ?= -shared - -# Compiler flags to link loadable module -LINK_MODULE_FLAGS ?= -shared - -# C compiler -CC = gcc - -# C++ compiler -CXX = g++ - -# Standard flags for CC -CFLAGS ?= - -# Standard flags for C++ -CXXFLAGS ?= - -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS ?= - -# Standard linker flags -LDFLAGS ?= - -# The C preprocessor -CPP ?= $(CC) -E - -# What type of library to build? [0,1] -SHARED ?= 0 - -# Build wxUniversal instead of native port? [0,1] -WXUNIV ?= 0 - -# Compile Unicode build of wxWidgets? [0,1] -UNICODE ?= 1 - -# Use MSLU library when building Unicode version. [0,1] -MSLU ?= 0 - -# Type of compiled binaries [debug,release] -BUILD ?= debug - -# Should debugging info be included in the executables? The default value -# "default" means that debug info will be included if BUILD=debug -# and not included if BUILD=release. [0,1,default] -DEBUG_INFO ?= default - -# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all -# but expensive assert checks are enabled, use 0 to completely remove debugging -# code. [0,1,default] -DEBUG_FLAG ?= 1 - -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC ?= 0 - -# Build GUI libraries? [0,1] -USE_GUI ?= 1 - -# Build wxHTML library (USE_GUI must be 1)? [0,1] -USE_HTML ?= 1 - -# Build multimedia library (USE_GUI must be 1)? [0,1] -USE_MEDIA ?= 1 - -# Build wxXRC library (USE_GUI must be 1)? [0,1] -USE_XRC ?= 1 - -# Build wxAUI library (USE_GUI must be 1)? [0,1] -USE_AUI ?= 1 - -# Build wxRibbon library (USE_GUI must be 1)? [0,1] -USE_RIBBON ?= 1 - -# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1] -USE_PROPGRID ?= 1 - -# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1] -USE_RICHTEXT ?= 1 - -# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1] -USE_STC ?= 1 - -# Build OpenGL canvas library (USE_GUI must be 1)? [0,1] -USE_OPENGL ?= 1 - -# Build quality assurance classes library (USE_GUI must be 1)? [0,1] -USE_QA ?= 0 - -# Enable exceptions in compiled code. [0,1] -USE_EXCEPTIONS ?= 1 - -# Enable run-time type information (RTTI) in compiled code. [0,1] -USE_RTTI ?= 1 - -# Enable threading in compiled code. [0,1] -USE_THREADS ?= 1 - -# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1] -USE_GDIPLUS ?= 0 - -# Is this official build by wxWidgets developers? [0,1] -OFFICIAL_BUILD ?= 0 - -# Use this to name your customized DLLs differently -VENDOR ?= custom - -# -WX_FLAVOUR ?= - -# -WX_LIB_FLAVOUR ?= - -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG ?= - -# Compiler flags needed to compile test suite in tests directory. If you want -# to run the tests, set it so that the compiler can find CppUnit headers. -CPPUNIT_CFLAGS ?= - -# Linker flags needed to link test suite in tests directory. If you want -# to run the tests, include CppUnit library here. -CPPUNIT_LIBS ?= - -# Version of C runtime library to use. You can change this to -# static if SHARED=0, but it is highly recommended to not do -# it if SHARED=1 unless you know what you are doing. [dynamic,static] -RUNTIME_LIBS ?= dynamic - -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer (comes with gcc3) -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION ?= 3 - +# ========================================================================= +# This configuration file was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Beware that all changes made to this file will be overwritten next +# time you run Bakefile! +# ========================================================================= + + +# ------------------------------------------------------------------------- +# These are configurable options: +# ------------------------------------------------------------------------- + +# Compiler flags to link shared library +LINK_DLL_FLAGS ?= -shared + +# Compiler flags to link loadable module +LINK_MODULE_FLAGS ?= -shared + +# C compiler +CC = gcc + +# C++ compiler +CXX = g++ + +# Standard flags for CC +CFLAGS ?= + +# Standard flags for C++ +CXXFLAGS ?= + +# Standard preprocessor flags (common for CC and CXX) +CPPFLAGS ?= + +# Standard linker flags +LDFLAGS ?= + +# The C preprocessor +CPP ?= $(CC) -E + +# What type of library to build? [0,1] +SHARED ?= 0 + +# Build wxUniversal instead of native port? [0,1] +WXUNIV ?= 0 + +# Compile Unicode build of wxWidgets? [0,1] +UNICODE ?= 1 + +# Use MSLU library when building Unicode version. [0,1] +MSLU ?= 0 + +# Type of compiled binaries [debug,release] +BUILD ?= debug + +# Should debugging info be included in the executables? The default value +# "default" means that debug info will be included if BUILD=debug +# and not included if BUILD=release. [0,1,default] +DEBUG_INFO ?= default + +# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all +# but expensive assert checks are enabled, use 0 to completely remove debugging +# code. [0,1,default] +DEBUG_FLAG ?= 1 + +# Multiple libraries or single huge monolithic one? [0,1] +MONOLITHIC ?= 0 + +# Build GUI libraries? [0,1] +USE_GUI ?= 1 + +# Build wxHTML library (USE_GUI must be 1)? [0,1] +USE_HTML ?= 1 + +# Build multimedia library (USE_GUI must be 1)? [0,1] +USE_MEDIA ?= 1 + +# Build wxXRC library (USE_GUI must be 1)? [0,1] +USE_XRC ?= 1 + +# Build wxAUI library (USE_GUI must be 1)? [0,1] +USE_AUI ?= 1 + +# Build wxRibbon library (USE_GUI must be 1)? [0,1] +USE_RIBBON ?= 1 + +# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1] +USE_PROPGRID ?= 1 + +# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1] +USE_RICHTEXT ?= 1 + +# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1] +USE_STC ?= 1 + +# Build OpenGL canvas library (USE_GUI must be 1)? [0,1] +USE_OPENGL ?= 1 + +# Build quality assurance classes library (USE_GUI must be 1)? [0,1] +USE_QA ?= 0 + +# Enable exceptions in compiled code. [0,1] +USE_EXCEPTIONS ?= 1 + +# Enable run-time type information (RTTI) in compiled code. [0,1] +USE_RTTI ?= 1 + +# Enable threading in compiled code. [0,1] +USE_THREADS ?= 1 + +# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1] +USE_GDIPLUS ?= 0 + +# Is this official build by wxWidgets developers? [0,1] +OFFICIAL_BUILD ?= 0 + +# Use this to name your customized DLLs differently +VENDOR ?= custom + +# +WX_FLAVOUR ?= + +# +WX_LIB_FLAVOUR ?= + +# Name of your custom configuration. This affects directory +# where object files are stored as well as the location of +# compiled .lib files and setup.h under the lib/ toplevel directory. +CFG ?= + +# Compiler flags needed to compile test suite in tests directory. If you want +# to run the tests, set it so that the compiler can find CppUnit headers. +CPPUNIT_CFLAGS ?= + +# Linker flags needed to link test suite in tests directory. If you want +# to run the tests, include CppUnit library here. +CPPUNIT_LIBS ?= + +# Version of C runtime library to use. You can change this to +# static if SHARED=0, but it is highly recommended to not do +# it if SHARED=1 unless you know what you are doing. [dynamic,static] +RUNTIME_LIBS ?= dynamic + +# Set the version of your Mingw installation here. +# "3" ...... this is for Mingw 2.0 or newer (comes with gcc3) +# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] +GCC_VERSION ?= 3 + diff --git a/build/msw/config.vc b/build/msw/config.vc index bd4f64f857..3e2df0b726 100644 --- a/build/msw/config.vc +++ b/build/msw/config.vc @@ -1,149 +1,149 @@ -# ========================================================================= -# This configuration file was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Beware that all changes made to this file will be overwritten next -# time you run Bakefile! -# ========================================================================= - - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# C compiler -CC = cl - -# C++ compiler -CXX = cl - -# Standard flags for CC -CFLAGS = - -# Standard flags for C++ -CXXFLAGS = - -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = - -# Standard linker flags -LDFLAGS = - -# The C preprocessor -CPP = $(CC) /EP /nologo - -# What type of library to build? [0,1] -SHARED = 0 - -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 - -# Compile Unicode build of wxWidgets? [0,1] -UNICODE = 1 - -# Use MSLU library when building Unicode version. [0,1] -MSLU = 0 - -# Type of compiled binaries [debug,release] -BUILD = debug - -# The target processor architecture must be specified when it is not X86. -# This does not affect the compiler output, so you still need to make sure -# your environment is set up appropriately with the correct compiler in the -# PATH. Rather it affects some options passed to some of the common build -# utilities such as the resource compiler and the linker. -# -# Accepted values: AMD64, IA64. -TARGET_CPU = $(CPU) - -# Should debugging info be included in the executables? The default value -# "default" means that debug info will be included if BUILD=debug -# and not included if BUILD=release. [0,1,default] -DEBUG_INFO = 1 - -# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all -# but expensive assert checks are enabled, use 0 to completely remove debugging -# code. [0,1,default] -DEBUG_FLAG = 1 - -# Link against debug (e.g. msvcrtd.dll) or release (msvcrt.dll) RTL? -# Default is to use debug CRT if and only if BUILD==debug. [0,1,default] -DEBUG_RUNTIME_LIBS = default - -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 0 - -# Build GUI libraries? [0,1] -USE_GUI = 1 - -# Build wxHTML library (USE_GUI must be 1)? [0,1] -USE_HTML = 1 - -# Build multimedia library (USE_GUI must be 1)? [0,1] -USE_MEDIA = 1 - -# Build wxXRC library (USE_GUI must be 1)? [0,1] -USE_XRC = 1 - -# Build wxAUI library (USE_GUI must be 1)? [0,1] -USE_AUI = 1 - -# Build wxRibbon library (USE_GUI must be 1)? [0,1] -USE_RIBBON = 1 - -# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1] -USE_PROPGRID = 1 - -# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1] -USE_RICHTEXT = 1 - -# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1] -USE_STC = 1 - -# Build OpenGL canvas library (USE_GUI must be 1)? [0,1] -USE_OPENGL = 1 - -# Build quality assurance classes library (USE_GUI must be 1)? [0,1] -USE_QA = 1 - -# Enable exceptions in compiled code. [0,1] -USE_EXCEPTIONS = 1 - -# Enable run-time type information (RTTI) in compiled code. [0,1] -USE_RTTI = 1 - -# Enable threading in compiled code. [0,1] -USE_THREADS = 1 - -# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1] -USE_GDIPLUS = 0 - -# Is this official build by wxWidgets developers? [0,1] -OFFICIAL_BUILD = 0 - -# Use this to name your customized DLLs differently -VENDOR = custom - -# -WX_FLAVOUR = - -# -WX_LIB_FLAVOUR = - -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = - -# Compiler flags needed to compile test suite in tests directory. If you want -# to run the tests, set it so that the compiler can find CppUnit headers. -CPPUNIT_CFLAGS = - -# Linker flags needed to link test suite in tests directory. If you want -# to run the tests, include CppUnit library here. -CPPUNIT_LIBS = - -# Version of C runtime library to use. You can change this to -# static if SHARED=0, but it is highly recommended to not do -# it if SHARED=1 unless you know what you are doing. [dynamic,static] -RUNTIME_LIBS = dynamic - +# ========================================================================= +# This configuration file was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Beware that all changes made to this file will be overwritten next +# time you run Bakefile! +# ========================================================================= + + +# ------------------------------------------------------------------------- +# These are configurable options: +# ------------------------------------------------------------------------- + +# C compiler +CC = cl + +# C++ compiler +CXX = cl + +# Standard flags for CC +CFLAGS = + +# Standard flags for C++ +CXXFLAGS = + +# Standard preprocessor flags (common for CC and CXX) +CPPFLAGS = + +# Standard linker flags +LDFLAGS = + +# The C preprocessor +CPP = $(CC) /EP /nologo + +# What type of library to build? [0,1] +SHARED = 0 + +# Build wxUniversal instead of native port? [0,1] +WXUNIV = 0 + +# Compile Unicode build of wxWidgets? [0,1] +UNICODE = 1 + +# Use MSLU library when building Unicode version. [0,1] +MSLU = 0 + +# Type of compiled binaries [debug,release] +BUILD = debug + +# The target processor architecture must be specified when it is not X86. +# This does not affect the compiler output, so you still need to make sure +# your environment is set up appropriately with the correct compiler in the +# PATH. Rather it affects some options passed to some of the common build +# utilities such as the resource compiler and the linker. +# +# Accepted values: AMD64, IA64. +TARGET_CPU = $(CPU) + +# Should debugging info be included in the executables? The default value +# "default" means that debug info will be included if BUILD=debug +# and not included if BUILD=release. [0,1,default] +DEBUG_INFO = 1 + +# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all +# but expensive assert checks are enabled, use 0 to completely remove debugging +# code. [0,1,default] +DEBUG_FLAG = 1 + +# Link against debug (e.g. msvcrtd.dll) or release (msvcrt.dll) RTL? +# Default is to use debug CRT if and only if BUILD==debug. [0,1,default] +DEBUG_RUNTIME_LIBS = default + +# Multiple libraries or single huge monolithic one? [0,1] +MONOLITHIC = 0 + +# Build GUI libraries? [0,1] +USE_GUI = 1 + +# Build wxHTML library (USE_GUI must be 1)? [0,1] +USE_HTML = 1 + +# Build multimedia library (USE_GUI must be 1)? [0,1] +USE_MEDIA = 1 + +# Build wxXRC library (USE_GUI must be 1)? [0,1] +USE_XRC = 1 + +# Build wxAUI library (USE_GUI must be 1)? [0,1] +USE_AUI = 1 + +# Build wxRibbon library (USE_GUI must be 1)? [0,1] +USE_RIBBON = 1 + +# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1] +USE_PROPGRID = 1 + +# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1] +USE_RICHTEXT = 1 + +# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1] +USE_STC = 1 + +# Build OpenGL canvas library (USE_GUI must be 1)? [0,1] +USE_OPENGL = 1 + +# Build quality assurance classes library (USE_GUI must be 1)? [0,1] +USE_QA = 1 + +# Enable exceptions in compiled code. [0,1] +USE_EXCEPTIONS = 1 + +# Enable run-time type information (RTTI) in compiled code. [0,1] +USE_RTTI = 1 + +# Enable threading in compiled code. [0,1] +USE_THREADS = 1 + +# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1] +USE_GDIPLUS = 0 + +# Is this official build by wxWidgets developers? [0,1] +OFFICIAL_BUILD = 0 + +# Use this to name your customized DLLs differently +VENDOR = custom + +# +WX_FLAVOUR = + +# +WX_LIB_FLAVOUR = + +# Name of your custom configuration. This affects directory +# where object files are stored as well as the location of +# compiled .lib files and setup.h under the lib/ toplevel directory. +CFG = + +# Compiler flags needed to compile test suite in tests directory. If you want +# to run the tests, set it so that the compiler can find CppUnit headers. +CPPUNIT_CFLAGS = + +# Linker flags needed to link test suite in tests directory. If you want +# to run the tests, include CppUnit library here. +CPPUNIT_LIBS = + +# Version of C runtime library to use. You can change this to +# static if SHARED=0, but it is highly recommended to not do +# it if SHARED=1 unless you know what you are doing. [dynamic,static] +RUNTIME_LIBS = dynamic + diff --git a/build/msw/config.wat b/build/msw/config.wat index 5cdb76bb8e..9ecace6fd2 100644 --- a/build/msw/config.wat +++ b/build/msw/config.wat @@ -1,140 +1,140 @@ -# ========================================================================= -# This configuration file was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Beware that all changes made to this file will be overwritten next -# time you run Bakefile! -# ========================================================================= - - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# C compiler -CC = wcc386 - -# C++ compiler -CXX = wpp386 - -# Standard flags for CC -CFLAGS = - -# Standard flags for C++ -CXXFLAGS = - -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = - -# Standard linker flags -LDFLAGS = - -# The C preprocessor -CPP = $(CC) -p - -# What type of library to build? [0,1] -# 1 - DLL -SHARED = 0 - -# Build wxUniversal instead of native port? [0,1] -# 1 - Universal -WXUNIV = 0 - -# Compile Unicode build of wxWidgets? [0,1] -# 1 - Unicode -UNICODE = 1 - -# Type of compiled binaries [debug,release] -BUILD = debug - -# Should debugging info be included in the executables? The default value -# "default" means that debug info will be included if BUILD=debug -# and not included if BUILD=release. [0,1,default] -DEBUG_INFO = default - -# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all -# but expensive assert checks are enabled, use 0 to completely remove debugging -# code. [0,1,default] -DEBUG_FLAG = 1 - -# Multiple libraries or single huge monolithic one? [0,1] -# 0 - Multilib -# 1 - Monolithic -MONOLITHIC = 1 - -# Build GUI libraries? [0,1] -# 0 - Base -# 1 - GUI -USE_GUI = 1 - -# Build wxHTML library (USE_GUI must be 1)? [0,1] -USE_HTML = 1 - -# Build multimedia library (USE_GUI must be 1)? [0,1] -USE_MEDIA = 1 - -# Build wxXRC library (USE_GUI must be 1)? [0,1] -USE_XRC = 1 - -# Build wxAUI library (USE_GUI must be 1)? [0,1] -USE_AUI = 1 - -# Build wxRibbon library (USE_GUI must be 1)? [0,1] -USE_RIBBON = 1 - -# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1] -USE_PROPGRID = 1 - -# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1] -USE_RICHTEXT = 1 - -# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1] -USE_STC = 1 - -# Build OpenGL canvas library (USE_GUI must be 1)? [0,1] -USE_OPENGL = 1 - -# Build quality assurance classes library (USE_GUI must be 1)? [0,1] -USE_QA = 0 - -# Enable exceptions in compiled code. [0,1] -USE_EXCEPTIONS = 1 - -# Enable run-time type information (RTTI) in compiled code. [0,1] -USE_RTTI = 1 - -# Enable threading in compiled code. [0,1] -USE_THREADS = 1 - -# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1] -USE_GDIPLUS = 0 - -# Is this official build by wxWidgets developers? [0,1] -OFFICIAL_BUILD = 0 - -# Use this to name your customized DLLs differently -VENDOR = custom - -# -WX_FLAVOUR = - -# -WX_LIB_FLAVOUR = - -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = - -# Compiler flags needed to compile test suite in tests directory. If you want -# to run the tests, set it so that the compiler can find CppUnit headers. -CPPUNIT_CFLAGS = - -# Linker flags needed to link test suite in tests directory. If you want -# to run the tests, include CppUnit library here. -CPPUNIT_LIBS = - -# Version of C runtime library to use. You can change this to -# static if SHARED=0, but it is highly recommended to not do -# it if SHARED=1 unless you know what you are doing. [dynamic,static] -RUNTIME_LIBS = dynamic - +# ========================================================================= +# This configuration file was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Beware that all changes made to this file will be overwritten next +# time you run Bakefile! +# ========================================================================= + + +# ------------------------------------------------------------------------- +# These are configurable options: +# ------------------------------------------------------------------------- + +# C compiler +CC = wcc386 + +# C++ compiler +CXX = wpp386 + +# Standard flags for CC +CFLAGS = + +# Standard flags for C++ +CXXFLAGS = + +# Standard preprocessor flags (common for CC and CXX) +CPPFLAGS = + +# Standard linker flags +LDFLAGS = + +# The C preprocessor +CPP = $(CC) -p + +# What type of library to build? [0,1] +# 1 - DLL +SHARED = 0 + +# Build wxUniversal instead of native port? [0,1] +# 1 - Universal +WXUNIV = 0 + +# Compile Unicode build of wxWidgets? [0,1] +# 1 - Unicode +UNICODE = 1 + +# Type of compiled binaries [debug,release] +BUILD = debug + +# Should debugging info be included in the executables? The default value +# "default" means that debug info will be included if BUILD=debug +# and not included if BUILD=release. [0,1,default] +DEBUG_INFO = default + +# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all +# but expensive assert checks are enabled, use 0 to completely remove debugging +# code. [0,1,default] +DEBUG_FLAG = 1 + +# Multiple libraries or single huge monolithic one? [0,1] +# 0 - Multilib +# 1 - Monolithic +MONOLITHIC = 1 + +# Build GUI libraries? [0,1] +# 0 - Base +# 1 - GUI +USE_GUI = 1 + +# Build wxHTML library (USE_GUI must be 1)? [0,1] +USE_HTML = 1 + +# Build multimedia library (USE_GUI must be 1)? [0,1] +USE_MEDIA = 1 + +# Build wxXRC library (USE_GUI must be 1)? [0,1] +USE_XRC = 1 + +# Build wxAUI library (USE_GUI must be 1)? [0,1] +USE_AUI = 1 + +# Build wxRibbon library (USE_GUI must be 1)? [0,1] +USE_RIBBON = 1 + +# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1] +USE_PROPGRID = 1 + +# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1] +USE_RICHTEXT = 1 + +# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1] +USE_STC = 1 + +# Build OpenGL canvas library (USE_GUI must be 1)? [0,1] +USE_OPENGL = 1 + +# Build quality assurance classes library (USE_GUI must be 1)? [0,1] +USE_QA = 0 + +# Enable exceptions in compiled code. [0,1] +USE_EXCEPTIONS = 1 + +# Enable run-time type information (RTTI) in compiled code. [0,1] +USE_RTTI = 1 + +# Enable threading in compiled code. [0,1] +USE_THREADS = 1 + +# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1] +USE_GDIPLUS = 0 + +# Is this official build by wxWidgets developers? [0,1] +OFFICIAL_BUILD = 0 + +# Use this to name your customized DLLs differently +VENDOR = custom + +# +WX_FLAVOUR = + +# +WX_LIB_FLAVOUR = + +# Name of your custom configuration. This affects directory +# where object files are stored as well as the location of +# compiled .lib files and setup.h under the lib/ toplevel directory. +CFG = + +# Compiler flags needed to compile test suite in tests directory. If you want +# to run the tests, set it so that the compiler can find CppUnit headers. +CPPUNIT_CFLAGS = + +# Linker flags needed to link test suite in tests directory. If you want +# to run the tests, include CppUnit library here. +CPPUNIT_LIBS = + +# Version of C runtime library to use. You can change this to +# static if SHARED=0, but it is highly recommended to not do +# it if SHARED=1 unless you know what you are doing. [dynamic,static] +RUNTIME_LIBS = dynamic + diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index b5ac096ccb..a38a6b2e43 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -1430,7 +1430,7 @@ PORTNAME = msw VENDORTAG = _$(VENDOR) !endif !if "$(OFFICIAL_BUILD)" == "1" -VENDORTAG = +VENDORTAG = !endif !if "$(BUILD)" == "debug" WXDEBUGFLAG = d @@ -1460,10 +1460,10 @@ __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = !endif !if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = !endif !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1" __monodll___depname = \ @@ -4209,7 +4209,7 @@ __htmldll_library_link_LIBR = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib !endif !if "$(USE_THREADS)" == "0" -__THREADSFLAG_13 = +__THREADSFLAG_13 = !endif !if "$(USE_THREADS)" == "1" __THREADSFLAG_13 = mt @@ -4218,7 +4218,7 @@ __THREADSFLAG_13 = mt __RUNTIME_LIBS_5 = i !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_5 = +__RUNTIME_LIBS_5 = !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p_62 = -d__WXUNIVERSAL__ @@ -4281,7 +4281,7 @@ __OPTIMIZEFLAG = -Od __OPTIMIZEFLAG = -O2 !endif !if "$(USE_THREADS)" == "0" -__THREADSFLAG = +__THREADSFLAG = !endif !if "$(USE_THREADS)" == "1" __THREADSFLAG = -tWM @@ -4290,7 +4290,7 @@ __THREADSFLAG = -tWM __RUNTIME_LIBS = -tWR !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS = +__RUNTIME_LIBS = !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -4335,7 +4335,7 @@ $(OBJS): all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file -clean: +clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\*.csm del $(OBJS)\*.csm @@ -4847,13 +4847,13 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD wxgl: $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP) !endif -samples: +samples: @echo cd ..\..\samples >$(OBJS)\samples.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>$(OBJS)\samples.bat call $(OBJS)\samples.bat @del $(OBJS)\samples.bat -$(LIBDIRNAME): +$(LIBDIRNAME): if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME) $(SETUPHDIR): $(LIBDIRNAME) @@ -4862,10 +4862,10 @@ $(SETUPHDIR): $(LIBDIRNAME) $(SETUPHDIR)\wx: $(SETUPHDIR) if not exist $(SETUPHDIR)\wx mkdir $(SETUPHDIR)\wx -..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h: +..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h: if not exist ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup0.h ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h -$(SETUPHDIR)\wx\setup.h: +$(SETUPHDIR)\wx\setup.h: if not exist $(SETUPHDIR)\wx\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h $(SETUPHDIR)\wx\msw: $(SETUPHDIR)\wx diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index e338931b6f..595abee5a8 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -1446,7 +1446,7 @@ ifeq ($(OFFICIAL_BUILD),0) VENDORTAG = _$(VENDOR) endif ifeq ($(OFFICIAL_BUILD),1) -VENDORTAG = +VENDORTAG = endif ifeq ($(BUILD),debug) WXDEBUGFLAG = d @@ -1476,10 +1476,10 @@ ifeq ($(USE_GUI),1) __wxtiff___depname = $(LIBDIRNAME)\libwxtiff$(WXDEBUGFLAG).a endif ifeq ($(MONOLITHIC),0) -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = endif ifeq ($(MONOLITHIC),1) -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = endif ifeq ($(MONOLITHIC),1) ifeq ($(SHARED),1) @@ -4425,11 +4425,11 @@ endif endif ifeq ($(BUILD),release) ifeq ($(DEBUG_INFO),default) -__DEBUGINFO = +__DEBUGINFO = endif endif ifeq ($(DEBUG_INFO),0) -__DEBUGINFO = +__DEBUGINFO = endif ifeq ($(DEBUG_INFO),1) __DEBUGINFO = -g @@ -4441,7 +4441,7 @@ ifeq ($(BUILD),release) __OPTIMIZEFLAG = -O2 endif ifeq ($(USE_THREADS),0) -__THREADSFLAG = +__THREADSFLAG = endif ifeq ($(USE_THREADS),1) __THREADSFLAG = -mthreads @@ -4450,13 +4450,13 @@ ifeq ($(USE_RTTI),0) __RTTIFLAG = -fno-rtti endif ifeq ($(USE_RTTI),1) -__RTTIFLAG = +__RTTIFLAG = endif ifeq ($(USE_EXCEPTIONS),0) __EXCEPTIONSFLAG = -fno-exceptions endif ifeq ($(USE_EXCEPTIONS),1) -__EXCEPTIONSFLAG = +__EXCEPTIONSFLAG = endif ifeq ($(WXUNIV),1) __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -4501,7 +4501,7 @@ $(OBJS): all: setup_h $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file -clean: +clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a del $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a @@ -5008,10 +5008,10 @@ wxgl: $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP) endif endif -samples: +samples: $(MAKE) -C ..\..\samples -f makefile.gcc $(MAKEARGS) all -$(LIBDIRNAME): +$(LIBDIRNAME): if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME) $(SETUPHDIR): $(LIBDIRNAME) @@ -5020,10 +5020,10 @@ $(SETUPHDIR): $(LIBDIRNAME) $(SETUPHDIR)\wx: $(SETUPHDIR) if not exist $(SETUPHDIR)\wx mkdir $(SETUPHDIR)\wx -..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h: +..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h: if not exist ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup0.h ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h -$(SETUPHDIR)\wx\setup.h: +$(SETUPHDIR)\wx\setup.h: if not exist $(SETUPHDIR)\wx\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h $(SETUPHDIR)\wx\msw: $(SETUPHDIR)\wx diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 81bef6c8fe..8e6d797eab 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -37,19 +37,20 @@ LIBDIRNAME = \ ..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \ - /I..\..\include /I$(SETUPHDIR) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ +WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 \ + $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \ + $(__DEBUGINFO_2) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \ + /DNDEBUG /I..\..\include /I$(SETUPHDIR) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CFLAGS) WXREGEX_OBJECTS = \ $(OBJS)\wxregex_regcomp.obj \ $(OBJS)\wxregex_regexec.obj \ $(OBJS)\wxregex_regerror.obj \ $(OBJS)\wxregex_regfree.obj -WXZLIB_CFLAGS = /M$(__RUNTIME_LIBS_21)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \ - $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG $(CPPFLAGS) $(CFLAGS) +WXZLIB_CFLAGS = /M$(__RUNTIME_LIBS_25)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \ + /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb $(__DEBUGINFO_17) \ + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \ + $(CPPFLAGS) $(CFLAGS) WXZLIB_OBJECTS = \ $(OBJS)\wxzlib_adler32.obj \ $(OBJS)\wxzlib_compress.obj \ @@ -63,10 +64,10 @@ WXZLIB_OBJECTS = \ $(OBJS)\wxzlib_infback.obj \ $(OBJS)\wxzlib_inftrees.obj \ $(OBJS)\wxzlib_inffast.obj -WXPNG_CFLAGS = /M$(__RUNTIME_LIBS_34)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \ - $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG /I..\..\src\zlib $(CPPFLAGS) \ - $(CFLAGS) +WXPNG_CFLAGS = /M$(__RUNTIME_LIBS_40)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \ + /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb $(__DEBUGINFO_32) \ + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \ + /I..\..\src\zlib $(CPPFLAGS) $(CFLAGS) WXPNG_OBJECTS = \ $(OBJS)\wxpng_png.obj \ $(OBJS)\wxpng_pngerror.obj \ @@ -85,10 +86,10 @@ WXPNG_OBJECTS = \ $(OBJS)\wxpng_pngwrite.obj \ $(OBJS)\wxpng_pngwtran.obj \ $(OBJS)\wxpng_pngwutil.obj -WXJPEG_CFLAGS = /M$(__RUNTIME_LIBS_47)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \ - $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG /I$(SETUPHDIR) $(CPPFLAGS) \ - $(CFLAGS) +WXJPEG_CFLAGS = /M$(__RUNTIME_LIBS_55)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \ + /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb $(__DEBUGINFO_47) \ + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \ + /I$(SETUPHDIR) $(CPPFLAGS) $(CFLAGS) WXJPEG_OBJECTS = \ $(OBJS)\wxjpeg_jcomapi.obj \ $(OBJS)\wxjpeg_jutils.obj \ @@ -136,10 +137,11 @@ WXJPEG_OBJECTS = \ $(OBJS)\wxjpeg_jquant1.obj \ $(OBJS)\wxjpeg_jquant2.obj \ $(OBJS)\wxjpeg_jdmerge.obj -WXTIFF_CFLAGS = /M$(__RUNTIME_LIBS_60)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \ - $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG /I..\..\src\zlib \ - /I..\..\src\jpeg /I..\..\src\tiff\libtiff $(CPPFLAGS) $(CFLAGS) +WXTIFF_CFLAGS = /M$(__RUNTIME_LIBS_70)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \ + /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb $(__DEBUGINFO_62) \ + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \ + /I..\..\src\zlib /I..\..\src\jpeg /I..\..\src\tiff\libtiff $(CPPFLAGS) \ + $(CFLAGS) WXTIFF_OBJECTS = \ $(OBJS)\wxtiff_tif_win32.obj \ $(OBJS)\wxtiff_tif_aux.obj \ @@ -177,20 +179,20 @@ WXTIFF_OBJECTS = \ $(OBJS)\wxtiff_tif_warning.obj \ $(OBJS)\wxtiff_tif_write.obj \ $(OBJS)\wxtiff_tif_zip.obj -WXEXPAT_CFLAGS = /M$(__RUNTIME_LIBS_73)$(__DEBUGRUNTIME) /DWIN32 \ +WXEXPAT_CFLAGS = /M$(__RUNTIME_LIBS_85)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \ - /I$(LIBDIRNAME) /DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS) + $(__DEBUGINFO_77) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \ + /DNDEBUG /I$(LIBDIRNAME) /DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS) WXEXPAT_OBJECTS = \ $(OBJS)\wxexpat_xmlparse.obj \ $(OBJS)\wxexpat_xmlrole.obj \ $(OBJS)\wxexpat_xmltok.obj -WXSCINTILLA_CXXFLAGS = /M$(__RUNTIME_LIBS_86)$(__DEBUGRUNTIME) /DWIN32 \ +WXSCINTILLA_CXXFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /DNDEBUG \ - /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \ - /DSCI_LEXER /DLINK_LEXERS $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \ - $(CXXFLAGS) + $(__DEBUGINFO_92) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \ + /DNDEBUG /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src \ + /D__WX__ /DSCI_LEXER /DLINK_LEXERS $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + $(CPPFLAGS) $(CXXFLAGS) WXSCINTILLA_OBJECTS = \ $(OBJS)\wxscintilla_AutoComplete.obj \ $(OBJS)\wxscintilla_CallTip.obj \ @@ -284,30 +286,30 @@ WXSCINTILLA_OBJECTS = \ $(OBJS)\wxscintilla_ViewStyle.obj \ $(OBJS)\wxscintilla_WindowAccessor.obj \ $(OBJS)\wxscintilla_XPM.obj -MONODLL_CFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \ +MONODLL_CFLAGS = /M$(__RUNTIME_LIBS_116)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 \ - /DWXMAKINGDLL /I..\..\src\stc\scintilla\include \ - /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS $(CPPFLAGS) \ - $(CFLAGS) -MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \ + $(__DEBUGINFO_108) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib /DwxUSE_BASE=1 /DWXMAKINGDLL \ + /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \ + /DSCI_LEXER /DLINK_LEXERS $(CPPFLAGS) $(CFLAGS) +MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS_116)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 \ - /DWXMAKINGDLL /I..\..\src\stc\scintilla\include \ - /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + $(__DEBUGINFO_108) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib /DwxUSE_BASE=1 /DWXMAKINGDLL \ + /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \ + /DSCI_LEXER /DLINK_LEXERS $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ /Fp"$(OBJS)\wxprec_monodll.pch" $(CPPFLAGS) $(CXXFLAGS) MONODLL_OBJECTS = \ $(OBJS)\monodll_dummy.obj \ @@ -436,28 +438,30 @@ MONODLL_OBJECTS = \ $(OBJS)\monodll_xtixml.obj MONODLL_RESOURCES = \ $(OBJS)\monodll_version.res -MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS_113)$(__DEBUGRUNTIME) /DWIN32 \ +MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS_131)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 \ - /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \ - /DSCI_LEXER /DLINK_LEXERS $(CPPFLAGS) $(CFLAGS) -MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_113)$(__DEBUGRUNTIME) /DWIN32 \ + $(__DEBUGINFO_123) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib /DwxUSE_BASE=1 /I..\..\src\stc\scintilla\include \ + /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS $(CPPFLAGS) \ + $(CFLAGS) +MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_131)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=1 \ - /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \ - /DSCI_LEXER /DLINK_LEXERS $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + $(__DEBUGINFO_123) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib /DwxUSE_BASE=1 /I..\..\src\stc\scintilla\include \ + /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \ + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ /Fp"$(OBJS)\wxprec_monolib.pch" $(CPPFLAGS) $(CXXFLAGS) MONOLIB_OBJECTS = \ $(OBJS)\monolib_dummy.obj \ @@ -584,27 +588,29 @@ MONOLIB_OBJECTS = \ $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \ $(OBJS)\monolib_xml.obj \ $(OBJS)\monolib_xtixml.obj -BASEDLL_CFLAGS = /M$(__RUNTIME_LIBS_127)$(__DEBUGRUNTIME) /DWIN32 \ +BASEDLL_CFLAGS = /M$(__RUNTIME_LIBS_147)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \ - /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) -BASEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_127)$(__DEBUGRUNTIME) /DWIN32 \ + $(__DEBUGINFO_139) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 \ + $(CPPFLAGS) $(CFLAGS) +BASEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_147)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \ - /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_basedll.pch" $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_139) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 \ + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_basedll.pch" $(CPPFLAGS) $(CXXFLAGS) BASEDLL_OBJECTS = \ $(OBJS)\basedll_dummy.obj \ $(OBJS)\basedll_any.obj \ @@ -717,27 +723,28 @@ BASEDLL_OBJECTS = \ $(OBJS)\basedll_volume.obj BASEDLL_RESOURCES = \ $(OBJS)\basedll_version.res -BASELIB_CFLAGS = /M$(__RUNTIME_LIBS_140)$(__DEBUGRUNTIME) /DWIN32 \ +BASELIB_CFLAGS = /M$(__RUNTIME_LIBS_162)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \ - /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) -BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_140)$(__DEBUGRUNTIME) /DWIN32 \ + $(__DEBUGINFO_154) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib /DwxUSE_GUI=0 /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) +BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_162)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \ - /DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_baselib.pch" $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_154) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib /DwxUSE_GUI=0 /DwxUSE_BASE=1 $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_baselib.pch" \ + $(CPPFLAGS) $(CXXFLAGS) BASELIB_OBJECTS = \ $(OBJS)\baselib_dummy.obj \ $(OBJS)\baselib_any.obj \ @@ -848,17 +855,18 @@ BASELIB_OBJECTS = \ $(OBJS)\baselib_main.obj \ $(OBJS)\baselib_mslu.obj \ $(OBJS)\baselib_volume.obj -NETDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_154)$(__DEBUGRUNTIME) /DWIN32 \ +NETDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_178)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \ - /DWXUSINGDLL /DWXMAKINGDLL_NET $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netdll.pch" $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_170) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_NET \ + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_netdll.pch" $(CPPFLAGS) $(CXXFLAGS) NETDLL_OBJECTS = \ $(OBJS)\netdll_dummy.obj \ $(OBJS)\netdll_fs_inet.obj \ @@ -875,17 +883,17 @@ NETDLL_OBJECTS = \ $(OBJS)\netdll_urlmsw.obj NETDLL_RESOURCES = \ $(OBJS)\netdll_version.res -NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_167)$(__DEBUGRUNTIME) /DWIN32 \ +NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_193)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_netlib.pch" $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_185) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netlib.pch" $(CPPFLAGS) $(CXXFLAGS) NETLIB_OBJECTS = \ $(OBJS)\netlib_dummy.obj \ $(OBJS)\netlib_fs_inet.obj \ @@ -900,17 +908,18 @@ NETLIB_OBJECTS = \ $(OBJS)\netlib_url.obj \ $(OBJS)\netlib_sockmsw.obj \ $(OBJS)\netlib_urlmsw.obj -COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_181)$(__DEBUGRUNTIME) /DWIN32 \ +COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_209)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ - /DWXMAKINGDLL_CORE /DwxUSE_BASE=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_coredll.pch" $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_201) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_CORE /DwxUSE_BASE=0 \ + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_coredll.pch" $(CPPFLAGS) $(CXXFLAGS) COREDLL_OBJECTS = \ $(OBJS)\coredll_dummy.obj \ $(OBJS)\coredll_event.obj \ @@ -924,17 +933,17 @@ COREDLL_OBJECTS = \ $(____CORE_SRC_FILENAMES_2_OBJECTS) COREDLL_RESOURCES = \ $(OBJS)\coredll_version.res -CORELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_194)$(__DEBUGRUNTIME) /DWIN32 \ +CORELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_224)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=0 \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_corelib.pch" $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_216) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib /DwxUSE_BASE=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_corelib.pch" $(CPPFLAGS) $(CXXFLAGS) CORELIB_OBJECTS = \ $(OBJS)\corelib_dummy.obj \ $(OBJS)\corelib_event.obj \ @@ -946,47 +955,49 @@ CORELIB_OBJECTS = \ $(OBJS)\corelib_mslu.obj \ $(OBJS)\corelib_volume.obj \ $(____CORE_SRC_FILENAMES_3_OBJECTS) -ADVDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_208)$(__DEBUGRUNTIME) /DWIN32 \ +ADVDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_240)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ - /DWXMAKINGDLL_ADV $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_advdll.pch" $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_232) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_ADV $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_advdll.pch" \ + $(CPPFLAGS) $(CXXFLAGS) ADVDLL_OBJECTS = \ $(OBJS)\advdll_dummy.obj \ $(____ADVANCED_SRC_FILENAMES_2_OBJECTS) ADVDLL_RESOURCES = \ $(OBJS)\advdll_version.res -ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_221)$(__DEBUGRUNTIME) /DWIN32 \ +ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_255)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_advlib.pch" \ - $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_247) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_advlib.pch" $(CPPFLAGS) $(CXXFLAGS) ADVLIB_OBJECTS = \ $(OBJS)\advlib_dummy.obj \ $(____ADVANCED_SRC_FILENAMES_3_OBJECTS) -MEDIADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_235)$(__DEBUGRUNTIME) /DWIN32 \ +MEDIADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_271)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ - /DWXMAKINGDLL_MEDIA $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_mediadll.pch" $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_263) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_MEDIA $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_mediadll.pch" \ + $(CPPFLAGS) $(CXXFLAGS) MEDIADLL_OBJECTS = \ $(OBJS)\mediadll_dummy.obj \ $(OBJS)\mediadll_mediactrlcmn.obj \ @@ -995,34 +1006,35 @@ MEDIADLL_OBJECTS = \ $(OBJS)\mediadll_mediactrl_qt.obj MEDIADLL_RESOURCES = \ $(OBJS)\mediadll_version.res -MEDIALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_248)$(__DEBUGRUNTIME) /DWIN32 \ +MEDIALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_286)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_medialib.pch" \ - $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_278) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_medialib.pch" $(CPPFLAGS) $(CXXFLAGS) MEDIALIB_OBJECTS = \ $(OBJS)\medialib_dummy.obj \ $(OBJS)\medialib_mediactrlcmn.obj \ $(OBJS)\medialib_mediactrl_am.obj \ $(OBJS)\medialib_mediactrl_wmp10.obj \ $(OBJS)\medialib_mediactrl_qt.obj -HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_262)$(__DEBUGRUNTIME) /DWIN32 \ +HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_302)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ - /DWXMAKINGDLL_HTML $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_htmldll.pch" $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_294) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_HTML $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_htmldll.pch" \ + $(CPPFLAGS) $(CXXFLAGS) HTMLDLL_OBJECTS = \ $(OBJS)\htmldll_dummy.obj \ $(OBJS)\htmldll_helpbest.obj \ @@ -1051,17 +1063,17 @@ HTMLDLL_OBJECTS = \ $(OBJS)\htmldll_htmllbox.obj HTMLDLL_RESOURCES = \ $(OBJS)\htmldll_version.res -HTMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_275)$(__DEBUGRUNTIME) /DWIN32 \ +HTMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_317)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_htmllib.pch" \ - $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_309) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_htmllib.pch" $(CPPFLAGS) $(CXXFLAGS) HTMLLIB_OBJECTS = \ $(OBJS)\htmllib_dummy.obj \ $(OBJS)\htmllib_helpbest.obj \ @@ -1088,81 +1100,84 @@ HTMLLIB_OBJECTS = \ $(OBJS)\htmllib_m_tables.obj \ $(OBJS)\htmllib_winpars.obj \ $(OBJS)\htmllib_htmllbox.obj -QADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_289)$(__DEBUGRUNTIME) /DWIN32 \ +QADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_333)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ - /DWXMAKINGDLL_QA $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_qadll.pch" $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_325) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_QA $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_qadll.pch" \ + $(CPPFLAGS) $(CXXFLAGS) QADLL_OBJECTS = \ $(OBJS)\qadll_dummy.obj \ $(OBJS)\qadll_debugrpt.obj \ $(OBJS)\qadll_dbgrptg.obj QADLL_RESOURCES = \ $(OBJS)\qadll_version.res -QALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_302)$(__DEBUGRUNTIME) /DWIN32 \ +QALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_348)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_qalib.pch" \ - $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_340) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_qalib.pch" $(CPPFLAGS) $(CXXFLAGS) QALIB_OBJECTS = \ $(OBJS)\qalib_dummy.obj \ $(OBJS)\qalib_debugrpt.obj \ $(OBJS)\qalib_dbgrptg.obj -XMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_316)$(__DEBUGRUNTIME) /DWIN32 \ +XMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_364)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \ - /DWXUSINGDLL /DWXMAKINGDLL_XML $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmldll.pch" $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_356) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib /DwxUSE_GUI=0 /DWXUSINGDLL /DWXMAKINGDLL_XML \ + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_xmldll.pch" $(CPPFLAGS) $(CXXFLAGS) XMLDLL_OBJECTS = \ $(OBJS)\xmldll_dummy.obj \ $(OBJS)\xmldll_xml.obj \ $(OBJS)\xmldll_xtixml.obj XMLDLL_RESOURCES = \ $(OBJS)\xmldll_version.res -XMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_329)$(__DEBUGRUNTIME) /DWIN32 \ +XMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_379)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_xmllib.pch" $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_371) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmllib.pch" $(CPPFLAGS) $(CXXFLAGS) XMLLIB_OBJECTS = \ $(OBJS)\xmllib_dummy.obj \ $(OBJS)\xmllib_xml.obj \ $(OBJS)\xmllib_xtixml.obj -XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_343)$(__DEBUGRUNTIME) /DWIN32 \ +XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_395)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ - /DWXMAKINGDLL_XRC $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_xrcdll.pch" $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_387) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_XRC $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xrcdll.pch" \ + $(CPPFLAGS) $(CXXFLAGS) XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_dummy.obj \ $(OBJS)\xrcdll_xh_animatctrl.obj \ @@ -1228,17 +1243,17 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xmlrsall.obj XRCDLL_RESOURCES = \ $(OBJS)\xrcdll_version.res -XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_356)$(__DEBUGRUNTIME) /DWIN32 \ +XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_410)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xrclib.pch" \ - $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_402) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_xrclib.pch" $(CPPFLAGS) $(CXXFLAGS) XRCLIB_OBJECTS = \ $(OBJS)\xrclib_dummy.obj \ $(OBJS)\xrclib_xh_animatctrl.obj \ @@ -1302,17 +1317,18 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xmlres.obj \ $(OBJS)\xrclib_xmladv.obj \ $(OBJS)\xrclib_xmlrsall.obj -AUIDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_370)$(__DEBUGRUNTIME) /DWIN32 \ +AUIDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_426)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ - /DWXMAKINGDLL_AUI $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_auidll.pch" $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_418) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_AUI $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_auidll.pch" \ + $(CPPFLAGS) $(CXXFLAGS) AUIDLL_OBJECTS = \ $(OBJS)\auidll_dummy.obj \ $(OBJS)\auidll_framemanager.obj \ @@ -1323,17 +1339,17 @@ AUIDLL_OBJECTS = \ $(OBJS)\auidll_tabmdi.obj AUIDLL_RESOURCES = \ $(OBJS)\auidll_version.res -AUILIB_CXXFLAGS = /M$(__RUNTIME_LIBS_383)$(__DEBUGRUNTIME) /DWIN32 \ +AUILIB_CXXFLAGS = /M$(__RUNTIME_LIBS_441)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_auilib.pch" \ - $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_433) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_auilib.pch" $(CPPFLAGS) $(CXXFLAGS) AUILIB_OBJECTS = \ $(OBJS)\auilib_dummy.obj \ $(OBJS)\auilib_framemanager.obj \ @@ -1342,17 +1358,18 @@ AUILIB_OBJECTS = \ $(OBJS)\auilib_auibook.obj \ $(OBJS)\auilib_auibar.obj \ $(OBJS)\auilib_tabmdi.obj -RIBBONDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_397)$(__DEBUGRUNTIME) /DWIN32 \ +RIBBONDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_457)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ - /DWXMAKINGDLL_RIBBON $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_ribbondll.pch" $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_449) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_RIBBON $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_ribbondll.pch" \ + $(CPPFLAGS) $(CXXFLAGS) RIBBONDLL_OBJECTS = \ $(OBJS)\ribbondll_dummy.obj \ $(OBJS)\ribbondll_art_internal.obj \ @@ -1367,17 +1384,17 @@ RIBBONDLL_OBJECTS = \ $(OBJS)\ribbondll_toolbar.obj RIBBONDLL_RESOURCES = \ $(OBJS)\ribbondll_version.res -RIBBONLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_410)$(__DEBUGRUNTIME) /DWIN32 \ +RIBBONLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_472)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_ribbonlib.pch" \ - $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_464) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_ribbonlib.pch" $(CPPFLAGS) $(CXXFLAGS) RIBBONLIB_OBJECTS = \ $(OBJS)\ribbonlib_dummy.obj \ $(OBJS)\ribbonlib_art_internal.obj \ @@ -1390,17 +1407,18 @@ RIBBONLIB_OBJECTS = \ $(OBJS)\ribbonlib_page.obj \ $(OBJS)\ribbonlib_panel.obj \ $(OBJS)\ribbonlib_toolbar.obj -PROPGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_424)$(__DEBUGRUNTIME) /DWIN32 \ +PROPGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_488)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ - /DWXMAKINGDLL_PROPGRID $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_propgriddll.pch" $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_480) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_PROPGRID $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_propgriddll.pch" \ + $(CPPFLAGS) $(CXXFLAGS) PROPGRIDDLL_OBJECTS = \ $(OBJS)\propgriddll_dummy.obj \ $(OBJS)\propgriddll_advprops.obj \ @@ -1413,17 +1431,17 @@ PROPGRIDDLL_OBJECTS = \ $(OBJS)\propgriddll_props.obj PROPGRIDDLL_RESOURCES = \ $(OBJS)\propgriddll_version.res -PROPGRIDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_437)$(__DEBUGRUNTIME) /DWIN32 \ +PROPGRIDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_503)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_propgridlib.pch" \ - $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_495) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_propgridlib.pch" $(CPPFLAGS) $(CXXFLAGS) PROPGRIDLIB_OBJECTS = \ $(OBJS)\propgridlib_dummy.obj \ $(OBJS)\propgridlib_advprops.obj \ @@ -1434,17 +1452,18 @@ PROPGRIDLIB_OBJECTS = \ $(OBJS)\propgridlib_propgridiface.obj \ $(OBJS)\propgridlib_propgridpagestate.obj \ $(OBJS)\propgridlib_props.obj -RICHTEXTDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_451)$(__DEBUGRUNTIME) /DWIN32 \ +RICHTEXTDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_519)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ - /DWXMAKINGDLL_RICHTEXT $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_richtextdll.pch" $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_511) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_RICHTEXT $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_richtextdll.pch" \ + $(CPPFLAGS) $(CXXFLAGS) RICHTEXTDLL_OBJECTS = \ $(OBJS)\richtextdll_dummy.obj \ $(OBJS)\richtextdll_richtextctrl.obj \ @@ -1458,17 +1477,17 @@ RICHTEXTDLL_OBJECTS = \ $(OBJS)\richtextdll_richtextprint.obj RICHTEXTDLL_RESOURCES = \ $(OBJS)\richtextdll_version.res -RICHTEXTLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_464)$(__DEBUGRUNTIME) /DWIN32 \ +RICHTEXTLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_534)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_richtextlib.pch" \ - $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_526) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_richtextlib.pch" $(CPPFLAGS) $(CXXFLAGS) RICHTEXTLIB_OBJECTS = \ $(OBJS)\richtextlib_dummy.obj \ $(OBJS)\richtextlib_richtextctrl.obj \ @@ -1480,19 +1499,19 @@ RICHTEXTLIB_OBJECTS = \ $(OBJS)\richtextlib_richtextsymboldlg.obj \ $(OBJS)\richtextlib_richtextstyledlg.obj \ $(OBJS)\richtextlib_richtextprint.obj -STCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_478)$(__DEBUGRUNTIME) /DWIN32 \ +STCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_550)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ - /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \ - /DSCI_LEXER /DLINK_LEXERS /DWXUSINGDLL /DWXMAKINGDLL_STC $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_stcdll.pch" \ - $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_542) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib /I..\..\src\stc\scintilla\include \ + /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \ + /DWXUSINGDLL /DWXMAKINGDLL_STC $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_stcdll.pch" $(CPPFLAGS) $(CXXFLAGS) STCDLL_OBJECTS = \ $(OBJS)\stcdll_dummy.obj \ $(OBJS)\stcdll_stc.obj \ @@ -1500,51 +1519,53 @@ STCDLL_OBJECTS = \ $(OBJS)\stcdll_ScintillaWX.obj STCDLL_RESOURCES = \ $(OBJS)\stcdll_version.res -STCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_491)$(__DEBUGRUNTIME) /DWIN32 \ +STCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_565)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ - /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\src /D__WX__ \ - /DSCI_LEXER /DLINK_LEXERS $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + $(__DEBUGINFO_557) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib /I..\..\src\stc\scintilla\include \ + /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \ + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ /Fp"$(OBJS)\wxprec_stclib.pch" $(CPPFLAGS) $(CXXFLAGS) STCLIB_OBJECTS = \ $(OBJS)\stclib_dummy.obj \ $(OBJS)\stclib_stc.obj \ $(OBJS)\stclib_PlatWX.obj \ $(OBJS)\stclib_ScintillaWX.obj -GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_505)$(__DEBUGRUNTIME) /DWIN32 \ +GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_581)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ - /DWXMAKINGDLL_GL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_gldll.pch" $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_573) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib /DWXUSINGDLL /DWXMAKINGDLL_GL $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_gldll.pch" \ + $(CPPFLAGS) $(CXXFLAGS) GLDLL_OBJECTS = \ $(OBJS)\gldll_dummy.obj \ $(OBJS)\gldll_glcmn.obj \ $(OBJS)\gldll_glcanvas.obj GLDLL_RESOURCES = \ $(OBJS)\gldll_version.res -GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_518)$(__DEBUGRUNTIME) /DWIN32 \ +GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_596)$(__DEBUGRUNTIME) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I..\..\include /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_gllib.pch" \ - $(CPPFLAGS) $(CXXFLAGS) + $(__DEBUGINFO_588) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I..\..\include /W4 /DWXBUILDING /I..\..\src\tiff\libtiff \ + /I..\..\src\jpeg /I..\..\src\png /I..\..\src\zlib /I..\..\src\regex \ + /I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ + /Fp"$(OBJS)\wxprec_gllib.pch" $(CPPFLAGS) $(CXXFLAGS) GLLIB_OBJECTS = \ $(OBJS)\gllib_dummy.obj \ $(OBJS)\gllib_glcmn.obj \ @@ -1563,7 +1584,7 @@ PORTNAME = msw VENDORTAG = _$(VENDOR) !endif !if "$(OFFICIAL_BUILD)" == "1" -VENDORTAG = +VENDORTAG = !endif !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" WXDEBUGFLAG = d @@ -1610,72 +1631,168 @@ LINK_TARGET_CPU = /MACHINE:AMD64 !if "$(TARGET_CPU)" == "ia64" LINK_TARGET_CPU = /MACHINE:IA64 !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D +__RUNTIME_LIBS_10 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG) +__RUNTIME_LIBS_10 = $(__THREADSFLAG) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_17 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_17 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_17 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_17 = $(__DEBUGRUNTIME_40) !endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_21 = D +__RUNTIME_LIBS_25 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_21 = $(__THREADSFLAG) +__RUNTIME_LIBS_25 = $(__THREADSFLAG) !endif !if "$(USE_GUI)" == "1" __wxpng___depname = $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_32 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_32 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_32 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_32 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_34 = D +__RUNTIME_LIBS_40 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_34 = $(__THREADSFLAG) +__RUNTIME_LIBS_40 = $(__THREADSFLAG) !endif !if "$(USE_GUI)" == "1" __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_47 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_47 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_47 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_47 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_47 = D +__RUNTIME_LIBS_55 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_47 = $(__THREADSFLAG) +__RUNTIME_LIBS_55 = $(__THREADSFLAG) !endif !if "$(USE_GUI)" == "1" __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_62 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_62 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_62 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_62 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_60 = D +__RUNTIME_LIBS_70 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_60 = $(__THREADSFLAG) +__RUNTIME_LIBS_70 = $(__THREADSFLAG) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_77 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_77 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_77 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_77 = $(__DEBUGRUNTIME_40) !endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_73 = D +__RUNTIME_LIBS_85 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_73 = $(__THREADSFLAG) +__RUNTIME_LIBS_85 = $(__THREADSFLAG) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_92 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_92 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_92 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_92 = $(__DEBUGRUNTIME_40) !endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_86 = D +__RUNTIME_LIBS_100 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_86 = $(__THREADSFLAG) +__RUNTIME_LIBS_100 = $(__THREADSFLAG) !endif !if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = !endif !if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = !endif !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1" __monodll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_108 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_108 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_108 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_108 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_100 = D +__RUNTIME_LIBS_116 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_100 = $(__THREADSFLAG) +__RUNTIME_LIBS_116 = $(__THREADSFLAG) !endif !if "$(USE_GUI)" == "1" ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ @@ -2375,11 +2492,23 @@ __wxscintilla_library_link_DEP = $(__wxscintilla) __monolib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_123 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_123 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_123 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_123 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_113 = D +__RUNTIME_LIBS_131 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_113 = $(__THREADSFLAG) +__RUNTIME_LIBS_131 = $(__THREADSFLAG) !endif !if "$(USE_GUI)" == "1" ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ @@ -3076,21 +3205,45 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ __basedll___depname = \ $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_139 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_139 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_139 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_139 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_127 = D +__RUNTIME_LIBS_147 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_127 = $(__THREADSFLAG) +__RUNTIME_LIBS_147 = $(__THREADSFLAG) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" __baselib___depname = \ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_154 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_154 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_154 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_154 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_140 = D +__RUNTIME_LIBS_162 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_140 = $(__THREADSFLAG) +__RUNTIME_LIBS_162 = $(__THREADSFLAG) !endif !if "$(SHARED)" == "1" ____wxbase_namedll_DEP = $(__basedll___depname) @@ -3102,21 +3255,45 @@ ____wxbase_namelib_DEP = $(__baselib___depname) __netdll___depname = \ $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_170 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_170 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_170 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_170 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_154 = D +__RUNTIME_LIBS_178 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_154 = $(__THREADSFLAG) +__RUNTIME_LIBS_178 = $(__THREADSFLAG) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" __netlib___depname = \ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_185 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_185 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_185 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_185 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_167 = D +__RUNTIME_LIBS_193 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_167 = $(__THREADSFLAG) +__RUNTIME_LIBS_193 = $(__THREADSFLAG) !endif !if "$(SHARED)" == "1" ____wxnet_namedll_DEP = $(__netdll___depname) @@ -3128,11 +3305,23 @@ ____wxnet_namelib_DEP = $(__netlib___depname) __coredll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_201 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_201 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_201 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_201 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_181 = D +__RUNTIME_LIBS_209 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_181 = $(__THREADSFLAG) +__RUNTIME_LIBS_209 = $(__THREADSFLAG) !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_2_OBJECTS = \ @@ -3621,11 +3810,23 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ __corelib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_216 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_216 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_216 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_216 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_194 = D +__RUNTIME_LIBS_224 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_194 = $(__THREADSFLAG) +__RUNTIME_LIBS_224 = $(__THREADSFLAG) !endif !if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" ____CORE_SRC_FILENAMES_3_OBJECTS = \ @@ -4120,11 +4321,23 @@ ____wxcore_namelib_DEP = $(__corelib___depname) __advdll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_232 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_232 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_232 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_232 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_208 = D +__RUNTIME_LIBS_240 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_208 = $(__THREADSFLAG) +__RUNTIME_LIBS_240 = $(__THREADSFLAG) !endif !if "$(WXUNIV)" == "0" ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ @@ -4206,11 +4419,23 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ __advlib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_247 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_247 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_247 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_247 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_221 = D +__RUNTIME_LIBS_255 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_221 = $(__THREADSFLAG) +__RUNTIME_LIBS_255 = $(__THREADSFLAG) !endif !if "$(WXUNIV)" == "0" ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ @@ -4298,21 +4523,45 @@ ____wxadv_namelib_DEP = $(__advlib___depname) __mediadll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_263 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_263 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_263 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_263 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_235 = D +__RUNTIME_LIBS_271 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_235 = $(__THREADSFLAG) +__RUNTIME_LIBS_271 = $(__THREADSFLAG) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1" __medialib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_278 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_278 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_278 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_278 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_248 = D +__RUNTIME_LIBS_286 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_248 = $(__THREADSFLAG) +__RUNTIME_LIBS_286 = $(__THREADSFLAG) !endif !if "$(SHARED)" == "1" ____wxmedia_namedll_DEP = $(__mediadll___depname) @@ -4324,21 +4573,45 @@ ____wxmedia_namelib_DEP = $(__medialib___depname) __htmldll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_294 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_294 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_294 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_294 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_262 = D +__RUNTIME_LIBS_302 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_262 = $(__THREADSFLAG) +__RUNTIME_LIBS_302 = $(__THREADSFLAG) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1" __htmllib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_309 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_309 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_309 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_309 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_275 = D +__RUNTIME_LIBS_317 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_275 = $(__THREADSFLAG) +__RUNTIME_LIBS_317 = $(__THREADSFLAG) !endif !if "$(SHARED)" == "1" ____wxhtml_namedll_DEP = $(__htmldll___depname) @@ -4350,21 +4623,45 @@ ____wxhtml_namelib_DEP = $(__htmllib___depname) __qadll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_325 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_325 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_325 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_325 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_289 = D +__RUNTIME_LIBS_333 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_289 = $(__THREADSFLAG) +__RUNTIME_LIBS_333 = $(__THREADSFLAG) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1" __qalib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_340 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_340 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_340 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_340 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_302 = D +__RUNTIME_LIBS_348 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_302 = $(__THREADSFLAG) +__RUNTIME_LIBS_348 = $(__THREADSFLAG) !endif !if "$(SHARED)" == "1" ____wxqa_namedll_DEP = $(__qadll___depname) @@ -4376,21 +4673,45 @@ ____wxqa_namelib_DEP = $(__qalib___depname) __xmldll___depname = \ $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_356 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_356 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_356 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_356 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_316 = D +__RUNTIME_LIBS_364 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_316 = $(__THREADSFLAG) +__RUNTIME_LIBS_364 = $(__THREADSFLAG) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" __xmllib___depname = \ $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_371 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_371 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_371 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_371 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_329 = D +__RUNTIME_LIBS_379 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_329 = $(__THREADSFLAG) +__RUNTIME_LIBS_379 = $(__THREADSFLAG) !endif !if "$(SHARED)" == "1" ____wxxml_namedll_DEP = $(__xmldll___depname) @@ -4402,21 +4723,45 @@ ____wxxml_namelib_DEP = $(__xmllib___depname) __xrcdll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_387 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_387 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_387 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_387 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_343 = D +__RUNTIME_LIBS_395 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_343 = $(__THREADSFLAG) +__RUNTIME_LIBS_395 = $(__THREADSFLAG) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_XRC)" == "1" __xrclib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_402 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_402 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_402 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_402 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_356 = D +__RUNTIME_LIBS_410 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_356 = $(__THREADSFLAG) +__RUNTIME_LIBS_410 = $(__THREADSFLAG) !endif !if "$(SHARED)" == "1" ____wxxrc_namedll_DEP = $(__xrcdll___depname) @@ -4428,21 +4773,45 @@ ____wxxrc_namelib_DEP = $(__xrclib___depname) __auidll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_418 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_418 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_418 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_418 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_370 = D +__RUNTIME_LIBS_426 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_370 = $(__THREADSFLAG) +__RUNTIME_LIBS_426 = $(__THREADSFLAG) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_AUI)" == "1" __auilib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_433 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_433 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_433 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_433 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_383 = D +__RUNTIME_LIBS_441 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_383 = $(__THREADSFLAG) +__RUNTIME_LIBS_441 = $(__THREADSFLAG) !endif !if "$(SHARED)" == "1" ____wxaui_namedll_DEP = $(__auidll___depname) @@ -4454,21 +4823,45 @@ ____wxaui_namelib_DEP = $(__auilib___depname) __ribbondll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).dll !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_449 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_449 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_449 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_449 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_397 = D +__RUNTIME_LIBS_457 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_397 = $(__THREADSFLAG) +__RUNTIME_LIBS_457 = $(__THREADSFLAG) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RIBBON)" == "1" __ribbonlib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_464 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_464 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_464 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_464 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_410 = D +__RUNTIME_LIBS_472 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_410 = $(__THREADSFLAG) +__RUNTIME_LIBS_472 = $(__THREADSFLAG) !endif !if "$(SHARED)" == "1" ____wxribbon_namedll_DEP = $(__ribbondll___depname) @@ -4480,21 +4873,45 @@ ____wxribbon_namelib_DEP = $(__ribbonlib___depname) __propgriddll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).dll !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_480 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_480 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_480 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_480 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_424 = D +__RUNTIME_LIBS_488 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_424 = $(__THREADSFLAG) +__RUNTIME_LIBS_488 = $(__THREADSFLAG) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_PROPGRID)" == "1" __propgridlib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_495 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_495 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_495 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_495 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_437 = D +__RUNTIME_LIBS_503 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_437 = $(__THREADSFLAG) +__RUNTIME_LIBS_503 = $(__THREADSFLAG) !endif !if "$(SHARED)" == "1" ____wxpropgrid_namedll_DEP = $(__propgriddll___depname) @@ -4506,21 +4923,45 @@ ____wxpropgrid_namelib_DEP = $(__propgridlib___depname) __richtextdll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_511 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_511 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_511 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_511 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_451 = D +__RUNTIME_LIBS_519 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_451 = $(__THREADSFLAG) +__RUNTIME_LIBS_519 = $(__THREADSFLAG) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RICHTEXT)" == "1" __richtextlib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_526 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_526 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_526 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_526 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_464 = D +__RUNTIME_LIBS_534 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_464 = $(__THREADSFLAG) +__RUNTIME_LIBS_534 = $(__THREADSFLAG) !endif !if "$(SHARED)" == "1" ____wxrichtext_namedll_DEP = $(__richtextdll___depname) @@ -4532,21 +4973,45 @@ ____wxrichtext_namelib_DEP = $(__richtextlib___depname) __stcdll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).dll !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_542 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_542 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_542 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_542 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_478 = D +__RUNTIME_LIBS_550 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_478 = $(__THREADSFLAG) +__RUNTIME_LIBS_550 = $(__THREADSFLAG) !endif !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_STC)" == "1" __stclib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_557 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_557 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_557 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_557 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_491 = D +__RUNTIME_LIBS_565 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_491 = $(__THREADSFLAG) +__RUNTIME_LIBS_565 = $(__THREADSFLAG) !endif !if "$(SHARED)" == "1" ____wxstc_namedll_DEP = $(__stcdll___depname) @@ -4558,11 +5023,23 @@ ____wxstc_namelib_DEP = $(__stclib___depname) __gldll___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_573 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_573 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_573 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_573 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_505 = D +__RUNTIME_LIBS_581 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_505 = $(__THREADSFLAG) +__RUNTIME_LIBS_581 = $(__THREADSFLAG) !endif !if "$(MONOLITHIC)" == "0" __WXLIBGLDEP_CORE_p = \ @@ -4580,11 +5057,23 @@ __WXLIB_MONO_p = \ __gllib___depname = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_588 = $(__DEBUGRUNTIME_40) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_588 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_588 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_588 = $(__DEBUGRUNTIME_40) +!endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_518 = D +__RUNTIME_LIBS_596 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_518 = $(__THREADSFLAG) +__RUNTIME_LIBS_596 = $(__THREADSFLAG) !endif !if "$(SHARED)" == "1" ____wxgl_namedll_DEP = $(__gldll___depname) @@ -4603,28 +5092,28 @@ __htmldll_library_link_LIBR = \ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_4 = /DEBUG +__DEBUGINFO_16 = /DEBUG !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_4 = +__DEBUGINFO_16 = !endif !if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_4 = +__DEBUGINFO_16 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_4 = /DEBUG +__DEBUGINFO_16 = /DEBUG !endif !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_4 = /d _DEBUG +____DEBUGRUNTIME_5 = /d _DEBUG !endif !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_4 = +____DEBUGRUNTIME_5 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_4 = +____DEBUGRUNTIME_5 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_4 = /d _DEBUG +____DEBUGRUNTIME_5 = /d _DEBUG !endif !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" __NO_VC_CRTDBG_p_68 = /d __NO_VC_CRTDBG__ @@ -4678,10 +5167,10 @@ __GDIPLUS_LIB_p = gdiplus.lib __DEBUGINFO = /Zi !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = +__DEBUGINFO = !endif !if "$(DEBUG_INFO)" == "0" -__DEBUGINFO = +__DEBUGINFO = !endif !if "$(DEBUG_INFO)" == "1" __DEBUGINFO = /Zi @@ -4690,10 +5179,10 @@ __DEBUGINFO = /Zi ____DEBUGRUNTIME = /D_DEBUG !endif !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME = +____DEBUGRUNTIME = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME = +____DEBUGRUNTIME = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" ____DEBUGRUNTIME = /D_DEBUG @@ -4702,14 +5191,26 @@ ____DEBUGRUNTIME = /D_DEBUG __DEBUGRUNTIME = d !endif !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME = +__DEBUGRUNTIME = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME = +__DEBUGRUNTIME = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" __DEBUGRUNTIME = d !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_40 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_40 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_40 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_40 = +!endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG = /Od !endif @@ -4723,13 +5224,13 @@ __THREADSFLAG = L __THREADSFLAG = T !endif !if "$(USE_RTTI)" == "0" -__RTTIFLAG = +__RTTIFLAG = !endif !if "$(USE_RTTI)" == "1" __RTTIFLAG = /GR !endif !if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG = +__EXCEPTIONSFLAG = !endif !if "$(USE_EXCEPTIONS)" == "1" __EXCEPTIONSFLAG = /EHsc @@ -4783,7 +5284,7 @@ $(OBJS): all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file -clean: +clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\*.pch del $(OBJS)\*.pch @@ -4932,7 +5433,7 @@ $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib: $(WXSCINTILLA_OBJECTS) !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\monodll_version.res $(__wxscintilla_library_link_DEP) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(MONODLL_OBJECTS) $(MONODLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(__wxscintilla) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib << !endif @@ -4947,7 +5448,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\basedll_version.res - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(BASEDLL_OBJECTS) $(BASEDLL_RESOURCES) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib << !endif @@ -4966,7 +5467,7 @@ wxbase: $(____wxbase_namedll_DEP) $(____wxbase_namelib_DEP) !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\netdll_version.res $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(NETDLL_OBJECTS) $(NETDLL_RESOURCES) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib << !endif @@ -4985,7 +5486,7 @@ wxnet: $(____wxnet_namedll_DEP) $(____wxnet_namelib_DEP) !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\coredll_version.res $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(COREDLL_OBJECTS) $(COREDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib << !endif @@ -5004,7 +5505,7 @@ wxcore: $(____wxcore_namedll_DEP) $(____wxcore_namelib_DEP) !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\advdll_version.res $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(ADVDLL_OBJECTS) $(ADVDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib << !endif @@ -5023,7 +5524,7 @@ wxadv: $(____wxadv_namedll_DEP) $(____wxadv_namelib_DEP) !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).dll: $(OBJS)\mediadll_dummy.obj $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\mediadll_version.res $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(MEDIADLL_OBJECTS) $(MEDIADLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib << !endif @@ -5042,7 +5543,7 @@ wxmedia: $(____wxmedia_namedll_DEP) $(____wxmedia_namelib_DEP) !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\htmldll_version.res $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(HTMLDLL_OBJECTS) $(HTMLDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib << !endif @@ -5061,7 +5562,7 @@ wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP) !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).dll: $(OBJS)\qadll_dummy.obj $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\qadll_version.res $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(QADLL_OBJECTS) $(QADLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib << !endif @@ -5080,7 +5581,7 @@ wxqa: $(____wxqa_namedll_DEP) $(____wxqa_namelib_DEP) !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" $(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xmldll_version.res $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(XMLDLL_OBJECTS) $(XMLDLL_RESOURCES) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib << !endif @@ -5099,7 +5600,7 @@ wxxml: $(____wxxml_namedll_DEP) $(____wxxml_namelib_DEP) !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xrcdll_version.res $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(XRCDLL_OBJECTS) $(XRCDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib << !endif @@ -5118,7 +5619,7 @@ wxxrc: $(____wxxrc_namedll_DEP) $(____wxxrc_namelib_DEP) !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).dll: $(OBJS)\auidll_dummy.obj $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\auidll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(AUIDLL_OBJECTS) $(AUIDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib << !endif @@ -5137,7 +5638,7 @@ wxaui: $(____wxaui_namedll_DEP) $(____wxaui_namelib_DEP) !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RIBBON)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).dll: $(OBJS)\ribbondll_dummy.obj $(RIBBONDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\ribbondll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(RIBBONDLL_OBJECTS) $(RIBBONDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib << !endif @@ -5156,7 +5657,7 @@ wxribbon: $(____wxribbon_namedll_DEP) $(____wxribbon_namelib_DEP) !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_PROPGRID)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).dll: $(OBJS)\propgriddll_dummy.obj $(PROPGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\propgriddll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(PROPGRIDDLL_OBJECTS) $(PROPGRIDDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib << !endif @@ -5175,7 +5676,7 @@ wxpropgrid: $(____wxpropgrid_namedll_DEP) $(____wxpropgrid_namelib_DEP) !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).dll: $(OBJS)\richtextdll_dummy.obj $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\richtextdll_version.res $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(RICHTEXTDLL_OBJECTS) $(RICHTEXTDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib << !endif @@ -5194,7 +5695,7 @@ wxrichtext: $(____wxrichtext_namedll_DEP) $(____wxrichtext_namelib_DEP) !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_STC)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).dll: $(OBJS)\stcdll_dummy.obj $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__wxscintilla) $(OBJS)\stcdll_version.res $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(STCDLL_OBJECTS) $(STCDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib << !endif @@ -5213,7 +5714,7 @@ wxstc: $(____wxstc_namedll_DEP) $(____wxstc_namelib_DEP) !if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\gldll_version.res $(__basedll___depname) $(__coredll___depname) $(__monodll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_16) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG).pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< $(GLDLL_OBJECTS) $(GLDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib << !endif @@ -5230,12 +5731,12 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD wxgl: $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP) !endif -sub_samples: +sub_samples: cd ..\..\samples $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" -$(LIBDIRNAME): +$(LIBDIRNAME): if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME) $(SETUPHDIR): $(LIBDIRNAME) @@ -5244,10 +5745,10 @@ $(SETUPHDIR): $(LIBDIRNAME) $(SETUPHDIR)\wx: $(SETUPHDIR) if not exist $(SETUPHDIR)\wx mkdir $(SETUPHDIR)\wx -..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h: +..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h: if not exist ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup0.h ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h -$(SETUPHDIR)\wx\setup.h: +$(SETUPHDIR)\wx\setup.h: if not exist $(SETUPHDIR)\wx\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h $(SETUPHDIR)\wx\msw: $(SETUPHDIR)\wx @@ -8088,7 +8589,7 @@ $(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp !endif $(OBJS)\monodll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_BASE=1 /d WXMAKINGDLL /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS ..\..\src\msw\version.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_BASE=1 /d WXMAKINGDLL /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS ..\..\src\msw\version.rc $(OBJS)\monolib_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp @@ -10263,7 +10764,7 @@ $(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp $(OBJS)\basedll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXMAKINGDLL_BASE /d wxUSE_BASE=1 ..\..\src\msw\version.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXMAKINGDLL_BASE /d wxUSE_BASE=1 ..\..\src\msw\version.rc $(OBJS)\basedll_any.obj: ..\..\src\common\any.cpp $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\any.cpp @@ -10920,7 +11421,7 @@ $(OBJS)\netdll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp $(OBJS)\netdll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_NET ..\..\src\msw\version.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_NET ..\..\src\msw\version.rc $(OBJS)\netdll_fs_inet.obj: ..\..\src\common\fs_inet.cpp $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\fs_inet.cpp @@ -11001,7 +11502,7 @@ $(OBJS)\coredll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp $(OBJS)\coredll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_CORE /d wxUSE_BASE=0 ..\..\src\msw\version.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_CORE /d wxUSE_BASE=0 ..\..\src\msw\version.rc $(OBJS)\coredll_event.obj: ..\..\src\common\event.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\event.cpp @@ -13542,7 +14043,7 @@ $(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp $(OBJS)\advdll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_ADV ..\..\src\msw\version.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_ADV ..\..\src\msw\version.rc $(OBJS)\advdll_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp @@ -13773,7 +14274,7 @@ $(OBJS)\mediadll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp $(OBJS)\mediadll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_MEDIA ..\..\src\msw\version.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_MEDIA ..\..\src\msw\version.rc $(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp @@ -13806,7 +14307,7 @@ $(OBJS)\htmldll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp $(OBJS)\htmldll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_HTML ..\..\src\msw\version.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_HTML ..\..\src\msw\version.rc $(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\msw\helpbest.cpp @@ -13959,7 +14460,7 @@ $(OBJS)\qadll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp $(OBJS)\qadll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_QA ..\..\src\msw\version.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_QA ..\..\src\msw\version.rc $(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) ..\..\src\common\debugrpt.cpp @@ -13980,7 +14481,7 @@ $(OBJS)\xmldll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp $(OBJS)\xmldll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_XML ..\..\src\msw\version.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wxbase$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_XML ..\..\src\msw\version.rc $(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) ..\..\src\xml\xml.cpp @@ -14001,7 +14502,7 @@ $(OBJS)\xrcdll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp $(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_XRC ..\..\src\msw\version.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_XRC ..\..\src\msw\version.rc $(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp @@ -14376,7 +14877,7 @@ $(OBJS)\auidll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp $(OBJS)\auidll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_AUI ..\..\src\msw\version.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_AUI ..\..\src\msw\version.rc $(OBJS)\auidll_framemanager.obj: ..\..\src\aui\framemanager.cpp $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\framemanager.cpp @@ -14421,7 +14922,7 @@ $(OBJS)\ribbondll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp $(OBJS)\ribbondll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_RIBBON ..\..\src\msw\version.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_RIBBON ..\..\src\msw\version.rc $(OBJS)\ribbondll_art_internal.obj: ..\..\src\ribbon\art_internal.cpp $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp @@ -14490,7 +14991,7 @@ $(OBJS)\propgriddll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp $(OBJS)\propgriddll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_PROPGRID ..\..\src\msw\version.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_PROPGRID ..\..\src\msw\version.rc $(OBJS)\propgriddll_advprops.obj: ..\..\src\propgrid\advprops.cpp $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp @@ -14547,7 +15048,7 @@ $(OBJS)\richtextdll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp $(OBJS)\richtextdll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_RICHTEXT ..\..\src\msw\version.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_RICHTEXT ..\..\src\msw\version.rc $(OBJS)\richtextdll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp @@ -14610,7 +15111,7 @@ $(OBJS)\stcdll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp $(OBJS)\stcdll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS /d WXUSINGDLL /d WXMAKINGDLL_STC ..\..\src\msw\version.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS /d WXUSINGDLL /d WXMAKINGDLL_STC ..\..\src\msw\version.rc $(OBJS)\stcdll_stc.obj: ..\..\src\stc\stc.cpp $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) ..\..\src\stc\stc.cpp @@ -14637,7 +15138,7 @@ $(OBJS)\gldll_dummy.obj: ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp $(OBJS)\gldll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_4) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_GL ..\..\src\msw\version.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_5) $(__NO_VC_CRTDBG_p_68) /d __WXMSW__ $(__WXUNIV_DEFINE_p_62) $(__DEBUG_DEFINE_p_61) $(__EXCEPTIONS_DEFINE_p_61) $(__RTTI_DEFINE_p_61) $(__THREAD_DEFINE_p_61) $(__UNICODE_DEFINE_p_62) $(__MSLU_DEFINE_p_61) $(__GFXCTX_DEFINE_p_61) /i $(SETUPHDIR) /i ..\..\include /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl_vc$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_GL ..\..\src\msw\version.rc $(OBJS)\gldll_glcmn.obj: ..\..\src\common\glcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) ..\..\src\common\glcmn.cpp diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index 8cfb89c3e0..03750b36d8 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -43,7 +43,7 @@ VENDORTAG = VENDORTAG = _$(VENDOR) !endif !ifeq OFFICIAL_BUILD 1 -VENDORTAG = +VENDORTAG = !endif WXDEBUGFLAG = !ifeq BUILD debug @@ -82,10 +82,10 @@ __wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = !endif !ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = !endif __monodll___depname = !ifeq MONOLITHIC 1 @@ -3069,11 +3069,11 @@ __DEBUGINFO_3 = debug all !endif !ifeq BUILD release !ifeq DEBUG_INFO default -__DEBUGINFO_3 = +__DEBUGINFO_3 = !endif !endif !ifeq DEBUG_INFO 0 -__DEBUGINFO_3 = +__DEBUGINFO_3 = !endif !ifeq DEBUG_INFO 1 __DEBUGINFO_3 = debug all @@ -3120,7 +3120,7 @@ __OPTIMIZEFLAG = -ot -ox !endif __THREADSFLAG = !ifeq USE_THREADS 0 -__THREADSFLAG = +__THREADSFLAG = !endif !ifeq USE_THREADS 1 __THREADSFLAG = -bm @@ -3130,18 +3130,18 @@ __RUNTIME_LIBS = __RUNTIME_LIBS = -br !endif !ifeq RUNTIME_LIBS static -__RUNTIME_LIBS = +__RUNTIME_LIBS = !endif __RTTIFLAG = !ifeq USE_RTTI 0 -__RTTIFLAG = +__RTTIFLAG = !endif !ifeq USE_RTTI 1 __RTTIFLAG = -xr !endif __EXCEPTIONSFLAG = !ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG = +__EXCEPTIONSFLAG = !endif !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG = -xs @@ -4601,7 +4601,7 @@ $(OBJS) : all : .SYMBOLIC setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file -clean : .SYMBOLIC +clean : .SYMBOLIC -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc @@ -5273,12 +5273,12 @@ wxgl : .SYMBOLIC $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP) !endif !endif -samples : .SYMBOLIC +samples : .SYMBOLIC cd ..\..\samples wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all cd $(WATCOM_CWD) -$(LIBDIRNAME) : +$(LIBDIRNAME) : if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME) $(SETUPHDIR) : $(LIBDIRNAME) @@ -5287,10 +5287,10 @@ $(SETUPHDIR) : $(LIBDIRNAME) $(SETUPHDIR)\wx : $(SETUPHDIR) if not exist $(SETUPHDIR)\wx mkdir $(SETUPHDIR)\wx -..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h : +..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h : if not exist ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup0.h ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h -$(SETUPHDIR)\wx\setup.h : +$(SETUPHDIR)\wx\setup.h : if not exist $(SETUPHDIR)\wx\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h $(SETUPHDIR)\wx\msw : $(SETUPHDIR)\wx diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp index 43a721442f..88d503cbb5 100644 --- a/build/msw/wx_base.dsp +++ b/build/msw/wx_base.dsp @@ -391,10 +391,10 @@ SOURCE=..\..\src\common\fs_mem.cpp # End Source File # Begin Source File -SOURCE=..\..\src\common\fswatchercmn.cpp -# End Source File -# Begin Source File - +SOURCE=..\..\src\common\fswatchercmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\hash.cpp # End Source File # Begin Source File @@ -623,10 +623,10 @@ SOURCE=..\..\src\msw\evtloop.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\fswatcher.cpp -# End Source File -# Begin Source File - +SOURCE=..\..\src\msw\fswatcher.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\msw\main.cpp # End Source File # Begin Source File @@ -717,14 +717,14 @@ SOURCE=..\..\src\msw\version.rc SOURCE=..\..\src\msw\volume.cpp # End Source File # End Group -# Begin Group "Generic Sources" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\src\generic\fswatcherg.cpp -# End Source File -# End Group +# Begin Group "Generic Sources" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\src\generic\fswatcherg.cpp +# End Source File +# End Group # Begin Group "Setup Headers" # PROP Default_Filter "" @@ -900,10 +900,10 @@ SOURCE=..\..\include\wx\msw\debughlp.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\fswatcher.h -# End Source File -# Begin Source File - +SOURCE=..\..\include\wx\msw\fswatcher.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\gccpriv.h # End Source File # Begin Source File @@ -1046,14 +1046,14 @@ SOURCE=..\..\include\wx\msw\wrapcdlg.h SOURCE=..\..\include\wx\msw\wrapwin.h # End Source File # End Group -# Begin Group "Generic Headers" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\..\include\wx\generic\fswatcher.h -# End Source File -# End Group +# Begin Group "Generic Headers" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=..\..\include\wx\generic\fswatcher.h +# End Source File +# End Group # Begin Group "wxHTML Headers" # PROP Default_Filter "" @@ -1279,10 +1279,10 @@ SOURCE=..\..\include\wx\fs_zip.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\fswatcher.h -# End Source File -# Begin Source File - +SOURCE=..\..\include\wx\fswatcher.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\hash.h # End Source File # Begin Source File diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index d54fcec929..edff22967e 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -5947,6 +5947,10 @@ SOURCE=..\..\include\wx\evtloop.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\evtloopsrc.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\fdrepdlg.h # End Source File # Begin Source File diff --git a/build/msw/wx_vc7_adv.vcproj b/build/msw/wx_vc7_adv.vcproj index 6efa6bf468..bd5ca939d1 100644 --- a/build/msw/wx_vc7_adv.vcproj +++ b/build/msw/wx_vc7_adv.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_aui.vcproj b/build/msw/wx_vc7_aui.vcproj index 7dbecd4b6c..3b3d3d4420 100644 --- a/build/msw/wx_vc7_aui.vcproj +++ b/build/msw/wx_vc7_aui.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_base.vcproj b/build/msw/wx_vc7_base.vcproj index 1232edd119..b440ec6877 100644 --- a/build/msw/wx_vc7_base.vcproj +++ b/build/msw/wx_vc7_base.vcproj @@ -2,7 +2,7 @@ @@ -733,9 +733,9 @@ RelativePath="..\..\src\common\fs_mem.cpp"> - - + + - - + + - - - - + + + + - - + + - - - - + + + + - - + + @@ -5077,6 +5077,9 @@ + + diff --git a/build/msw/wx_vc7_gl.vcproj b/build/msw/wx_vc7_gl.vcproj index 39d23821aa..82553a146b 100644 --- a/build/msw/wx_vc7_gl.vcproj +++ b/build/msw/wx_vc7_gl.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_html.vcproj b/build/msw/wx_vc7_html.vcproj index 0617918340..e86c9a5f09 100644 --- a/build/msw/wx_vc7_html.vcproj +++ b/build/msw/wx_vc7_html.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_media.vcproj b/build/msw/wx_vc7_media.vcproj index 01fb50fb95..7f8f2192a4 100644 --- a/build/msw/wx_vc7_media.vcproj +++ b/build/msw/wx_vc7_media.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_net.vcproj b/build/msw/wx_vc7_net.vcproj index e04e6fb9bb..7344f9435e 100644 --- a/build/msw/wx_vc7_net.vcproj +++ b/build/msw/wx_vc7_net.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_propgrid.vcproj b/build/msw/wx_vc7_propgrid.vcproj index c828d9052d..8fe0818997 100644 --- a/build/msw/wx_vc7_propgrid.vcproj +++ b/build/msw/wx_vc7_propgrid.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_qa.vcproj b/build/msw/wx_vc7_qa.vcproj index 37715c4903..03185c03b4 100644 --- a/build/msw/wx_vc7_qa.vcproj +++ b/build/msw/wx_vc7_qa.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_ribbon.vcproj b/build/msw/wx_vc7_ribbon.vcproj index f99106cbc5..5e57b4dd5c 100644 --- a/build/msw/wx_vc7_ribbon.vcproj +++ b/build/msw/wx_vc7_ribbon.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_richtext.vcproj b/build/msw/wx_vc7_richtext.vcproj index 0eaf610175..a751187e45 100644 --- a/build/msw/wx_vc7_richtext.vcproj +++ b/build/msw/wx_vc7_richtext.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_stc.vcproj b/build/msw/wx_vc7_stc.vcproj index 9fd646d600..576cab235f 100644 --- a/build/msw/wx_vc7_stc.vcproj +++ b/build/msw/wx_vc7_stc.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc7_wxexpat.vcproj b/build/msw/wx_vc7_wxexpat.vcproj index 525725b797..a6f46cfb7f 100644 --- a/build/msw/wx_vc7_wxexpat.vcproj +++ b/build/msw/wx_vc7_wxexpat.vcproj @@ -2,7 +2,7 @@ @@ -27,7 +27,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\lib\vc_lib" - PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;COMPILED_FROM_DSP" MinimalRebuild="TRUE" ExceptionHandling="TRUE" BasicRuntimeChecks="3" @@ -48,7 +48,7 @@ SuppressStartupBanner="TRUE"/> @@ -58,7 +58,7 @@ Name="VCPreLinkEventTool"/> @@ -111,7 +111,7 @@ Name="VCPreLinkEventTool"/> @@ -167,7 +167,7 @@ Name="VCPreLinkEventTool"/> @@ -220,7 +220,7 @@ Name="VCPreLinkEventTool"/> @@ -276,7 +276,7 @@ Name="VCPreLinkEventTool"/> @@ -329,7 +329,7 @@ Name="VCPreLinkEventTool"/> @@ -385,7 +385,7 @@ Name="VCPreLinkEventTool"/> @@ -438,7 +438,7 @@ Name="VCPreLinkEventTool"/> @@ -27,7 +27,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\lib\vc_lib\mswud" - PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG" MinimalRebuild="TRUE" ExceptionHandling="TRUE" BasicRuntimeChecks="3" @@ -48,7 +48,7 @@ SuppressStartupBanner="TRUE"/> @@ -58,7 +58,7 @@ Name="VCPreLinkEventTool"/> @@ -111,7 +111,7 @@ Name="VCPreLinkEventTool"/> @@ -167,7 +167,7 @@ Name="VCPreLinkEventTool"/> @@ -220,7 +220,7 @@ Name="VCPreLinkEventTool"/> @@ -276,7 +276,7 @@ Name="VCPreLinkEventTool"/> @@ -329,7 +329,7 @@ Name="VCPreLinkEventTool"/> @@ -385,7 +385,7 @@ Name="VCPreLinkEventTool"/> @@ -438,7 +438,7 @@ Name="VCPreLinkEventTool"/> @@ -27,7 +27,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\src\zlib" - PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG" MinimalRebuild="TRUE" ExceptionHandling="TRUE" BasicRuntimeChecks="3" @@ -48,7 +48,7 @@ SuppressStartupBanner="TRUE"/> @@ -58,7 +58,7 @@ Name="VCPreLinkEventTool"/> @@ -111,7 +111,7 @@ Name="VCPreLinkEventTool"/> @@ -167,7 +167,7 @@ Name="VCPreLinkEventTool"/> @@ -220,7 +220,7 @@ Name="VCPreLinkEventTool"/> @@ -276,7 +276,7 @@ Name="VCPreLinkEventTool"/> @@ -329,7 +329,7 @@ Name="VCPreLinkEventTool"/> @@ -385,7 +385,7 @@ Name="VCPreLinkEventTool"/> @@ -438,7 +438,7 @@ Name="VCPreLinkEventTool"/> @@ -28,7 +28,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\include;..\..\lib\vc_lib\mswud" - PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WXMSW__;_UNICODE" MinimalRebuild="TRUE" ExceptionHandling="TRUE" BasicRuntimeChecks="3" @@ -49,7 +49,7 @@ SuppressStartupBanner="TRUE"/> @@ -59,7 +59,7 @@ Name="VCPreLinkEventTool"/> @@ -113,7 +113,7 @@ Name="VCPreLinkEventTool"/> @@ -170,7 +170,7 @@ Name="VCPreLinkEventTool"/> @@ -224,7 +224,7 @@ Name="VCPreLinkEventTool"/> @@ -281,7 +281,7 @@ Name="VCPreLinkEventTool"/> @@ -335,7 +335,7 @@ Name="VCPreLinkEventTool"/> @@ -392,7 +392,7 @@ Name="VCPreLinkEventTool"/> @@ -446,7 +446,7 @@ Name="VCPreLinkEventTool"/> @@ -27,7 +27,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\src" - PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;__WX__;SCI_LEXER;LINK_LEXERS" MinimalRebuild="TRUE" ExceptionHandling="TRUE" BasicRuntimeChecks="3" @@ -48,7 +48,7 @@ SuppressStartupBanner="TRUE"/> @@ -58,7 +58,7 @@ Name="VCPreLinkEventTool"/> @@ -111,7 +111,7 @@ Name="VCPreLinkEventTool"/> @@ -167,7 +167,7 @@ Name="VCPreLinkEventTool"/> @@ -220,7 +220,7 @@ Name="VCPreLinkEventTool"/> @@ -276,7 +276,7 @@ Name="VCPreLinkEventTool"/> @@ -329,7 +329,7 @@ Name="VCPreLinkEventTool"/> @@ -385,7 +385,7 @@ Name="VCPreLinkEventTool"/> @@ -438,7 +438,7 @@ Name="VCPreLinkEventTool"/> @@ -27,7 +27,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff" - PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG" MinimalRebuild="TRUE" ExceptionHandling="TRUE" BasicRuntimeChecks="3" @@ -48,7 +48,7 @@ SuppressStartupBanner="TRUE"/> @@ -58,7 +58,7 @@ Name="VCPreLinkEventTool"/> @@ -111,7 +111,7 @@ Name="VCPreLinkEventTool"/> @@ -167,7 +167,7 @@ Name="VCPreLinkEventTool"/> @@ -220,7 +220,7 @@ Name="VCPreLinkEventTool"/> @@ -276,7 +276,7 @@ Name="VCPreLinkEventTool"/> @@ -329,7 +329,7 @@ Name="VCPreLinkEventTool"/> @@ -385,7 +385,7 @@ Name="VCPreLinkEventTool"/> @@ -438,7 +438,7 @@ Name="VCPreLinkEventTool"/> @@ -27,7 +27,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG" MinimalRebuild="TRUE" ExceptionHandling="TRUE" BasicRuntimeChecks="3" @@ -48,7 +48,7 @@ SuppressStartupBanner="TRUE"/> @@ -58,7 +58,7 @@ Name="VCPreLinkEventTool"/> @@ -111,7 +111,7 @@ Name="VCPreLinkEventTool"/> @@ -167,7 +167,7 @@ Name="VCPreLinkEventTool"/> @@ -220,7 +220,7 @@ Name="VCPreLinkEventTool"/> @@ -276,7 +276,7 @@ Name="VCPreLinkEventTool"/> @@ -329,7 +329,7 @@ Name="VCPreLinkEventTool"/> @@ -385,7 +385,7 @@ Name="VCPreLinkEventTool"/> @@ -438,7 +438,7 @@ Name="VCPreLinkEventTool"/> diff --git a/build/msw/wx_vc7_xrc.vcproj b/build/msw/wx_vc7_xrc.vcproj index cb28dd92b1..24504ea6d4 100644 --- a/build/msw/wx_vc7_xrc.vcproj +++ b/build/msw/wx_vc7_xrc.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_adv.vcproj b/build/msw/wx_vc8_adv.vcproj index 24d7979e80..dadef49893 100644 --- a/build/msw/wx_vc8_adv.vcproj +++ b/build/msw/wx_vc8_adv.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_aui.vcproj b/build/msw/wx_vc8_aui.vcproj index e10b6e52ee..6d60e647bb 100644 --- a/build/msw/wx_vc8_aui.vcproj +++ b/build/msw/wx_vc8_aui.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_base.vcproj b/build/msw/wx_vc8_base.vcproj index eac5aa5aad..ffb8e90cd0 100644 --- a/build/msw/wx_vc8_base.vcproj +++ b/build/msw/wx_vc8_base.vcproj @@ -2,7 +2,7 @@ @@ -1011,10 +1011,10 @@ > - - + + @@ -1244,10 +1244,10 @@ > - - + + @@ -1325,15 +1325,15 @@ - - - - + + + + @@ -1487,10 +1487,10 @@ > - - + + @@ -1640,15 +1640,15 @@ - - - - + + + + @@ -1874,10 +1874,10 @@ > - - + + diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj index a408b8b347..d715871918 100644 --- a/build/msw/wx_vc8_core.vcproj +++ b/build/msw/wx_vc8_core.vcproj @@ -2,7 +2,7 @@ @@ -6787,6 +6787,10 @@ RelativePath="..\..\include\wx\evtloop.h" > + + diff --git a/build/msw/wx_vc8_gl.vcproj b/build/msw/wx_vc8_gl.vcproj index fb7e457e30..b73e071ce3 100644 --- a/build/msw/wx_vc8_gl.vcproj +++ b/build/msw/wx_vc8_gl.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_html.vcproj b/build/msw/wx_vc8_html.vcproj index 4e0aa60dac..54736ecf79 100644 --- a/build/msw/wx_vc8_html.vcproj +++ b/build/msw/wx_vc8_html.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_media.vcproj b/build/msw/wx_vc8_media.vcproj index d908905ed1..e33a72d61d 100644 --- a/build/msw/wx_vc8_media.vcproj +++ b/build/msw/wx_vc8_media.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_net.vcproj b/build/msw/wx_vc8_net.vcproj index 7f7d4bb6f2..93ef8106fe 100644 --- a/build/msw/wx_vc8_net.vcproj +++ b/build/msw/wx_vc8_net.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_propgrid.vcproj b/build/msw/wx_vc8_propgrid.vcproj index 194155ecbb..5daaff193c 100644 --- a/build/msw/wx_vc8_propgrid.vcproj +++ b/build/msw/wx_vc8_propgrid.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_qa.vcproj b/build/msw/wx_vc8_qa.vcproj index 2bb3c1f9d6..4b03f7e8a6 100644 --- a/build/msw/wx_vc8_qa.vcproj +++ b/build/msw/wx_vc8_qa.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_ribbon.vcproj b/build/msw/wx_vc8_ribbon.vcproj index 9dcdc2433d..0de6955155 100644 --- a/build/msw/wx_vc8_ribbon.vcproj +++ b/build/msw/wx_vc8_ribbon.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_richtext.vcproj b/build/msw/wx_vc8_richtext.vcproj index f2ba506546..a34707120d 100644 --- a/build/msw/wx_vc8_richtext.vcproj +++ b/build/msw/wx_vc8_richtext.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_stc.vcproj b/build/msw/wx_vc8_stc.vcproj index 72fa76e837..066f624c65 100644 --- a/build/msw/wx_vc8_stc.vcproj +++ b/build/msw/wx_vc8_stc.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_wxexpat.vcproj b/build/msw/wx_vc8_wxexpat.vcproj index 8c69d8c2fb..5c198827d3 100644 --- a/build/msw/wx_vc8_wxexpat.vcproj +++ b/build/msw/wx_vc8_wxexpat.vcproj @@ -2,7 +2,7 @@ @@ -43,14 +43,14 @@ /> @@ -124,14 +124,14 @@ /> @@ -202,14 +202,14 @@ /> @@ -283,14 +283,14 @@ /> @@ -361,14 +361,14 @@ /> @@ -442,14 +442,14 @@ /> @@ -520,14 +520,14 @@ /> @@ -601,14 +601,14 @@ /> diff --git a/build/msw/wx_vc8_wxjpeg.vcproj b/build/msw/wx_vc8_wxjpeg.vcproj index e52b1e1298..3492b5d8c3 100644 --- a/build/msw/wx_vc8_wxjpeg.vcproj +++ b/build/msw/wx_vc8_wxjpeg.vcproj @@ -2,7 +2,7 @@ @@ -43,14 +43,14 @@ /> @@ -124,14 +124,14 @@ /> @@ -202,14 +202,14 @@ /> @@ -283,14 +283,14 @@ /> @@ -361,14 +361,14 @@ /> @@ -442,14 +442,14 @@ /> @@ -520,14 +520,14 @@ /> @@ -601,14 +601,14 @@ /> diff --git a/build/msw/wx_vc8_wxpng.vcproj b/build/msw/wx_vc8_wxpng.vcproj index 35d94ca446..c9edca35a4 100644 --- a/build/msw/wx_vc8_wxpng.vcproj +++ b/build/msw/wx_vc8_wxpng.vcproj @@ -2,7 +2,7 @@ @@ -43,14 +43,14 @@ /> @@ -124,14 +124,14 @@ /> @@ -202,14 +202,14 @@ /> @@ -283,14 +283,14 @@ /> @@ -361,14 +361,14 @@ /> @@ -442,14 +442,14 @@ /> @@ -520,14 +520,14 @@ /> @@ -601,14 +601,14 @@ /> diff --git a/build/msw/wx_vc8_wxregex.vcproj b/build/msw/wx_vc8_wxregex.vcproj index b7848b78cd..9a31fefac9 100644 --- a/build/msw/wx_vc8_wxregex.vcproj +++ b/build/msw/wx_vc8_wxregex.vcproj @@ -2,7 +2,7 @@ @@ -44,14 +44,14 @@ /> @@ -126,14 +126,14 @@ /> @@ -205,14 +205,14 @@ /> @@ -287,14 +287,14 @@ /> @@ -366,14 +366,14 @@ /> @@ -448,14 +448,14 @@ /> @@ -527,14 +527,14 @@ /> @@ -609,14 +609,14 @@ /> diff --git a/build/msw/wx_vc8_wxscintilla.vcproj b/build/msw/wx_vc8_wxscintilla.vcproj index e1c990bee4..d5bfac5b90 100644 --- a/build/msw/wx_vc8_wxscintilla.vcproj +++ b/build/msw/wx_vc8_wxscintilla.vcproj @@ -2,7 +2,7 @@ @@ -43,14 +43,14 @@ /> @@ -124,14 +124,14 @@ /> @@ -202,14 +202,14 @@ /> @@ -283,14 +283,14 @@ /> @@ -361,14 +361,14 @@ /> @@ -442,14 +442,14 @@ /> @@ -520,14 +520,14 @@ /> @@ -601,14 +601,14 @@ /> diff --git a/build/msw/wx_vc8_wxtiff.vcproj b/build/msw/wx_vc8_wxtiff.vcproj index 90e5552a3b..18ba622e6c 100644 --- a/build/msw/wx_vc8_wxtiff.vcproj +++ b/build/msw/wx_vc8_wxtiff.vcproj @@ -2,7 +2,7 @@ @@ -43,14 +43,14 @@ /> @@ -124,14 +124,14 @@ /> @@ -202,14 +202,14 @@ /> @@ -283,14 +283,14 @@ /> @@ -361,14 +361,14 @@ /> @@ -442,14 +442,14 @@ /> @@ -520,14 +520,14 @@ /> @@ -601,14 +601,14 @@ /> diff --git a/build/msw/wx_vc8_wxzlib.vcproj b/build/msw/wx_vc8_wxzlib.vcproj index b84c4abcde..1e5bcd5c31 100644 --- a/build/msw/wx_vc8_wxzlib.vcproj +++ b/build/msw/wx_vc8_wxzlib.vcproj @@ -2,7 +2,7 @@ @@ -43,14 +43,14 @@ /> @@ -124,14 +124,14 @@ /> @@ -202,14 +202,14 @@ /> @@ -283,14 +283,14 @@ /> @@ -361,14 +361,14 @@ /> @@ -442,14 +442,14 @@ /> @@ -520,14 +520,14 @@ /> @@ -601,14 +601,14 @@ /> diff --git a/build/msw/wx_vc8_xml.vcproj b/build/msw/wx_vc8_xml.vcproj index 04cc1b42e1..c45e1f6287 100644 --- a/build/msw/wx_vc8_xml.vcproj +++ b/build/msw/wx_vc8_xml.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc8_xrc.vcproj b/build/msw/wx_vc8_xrc.vcproj index 27bdf9deff..797da872ce 100644 --- a/build/msw/wx_vc8_xrc.vcproj +++ b/build/msw/wx_vc8_xrc.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_adv.vcproj b/build/msw/wx_vc9_adv.vcproj index db8f487f83..907e297d42 100644 --- a/build/msw/wx_vc9_adv.vcproj +++ b/build/msw/wx_vc9_adv.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_aui.vcproj b/build/msw/wx_vc9_aui.vcproj index 7f8bb34fe3..23eaaeb6ee 100644 --- a/build/msw/wx_vc9_aui.vcproj +++ b/build/msw/wx_vc9_aui.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_base.vcproj b/build/msw/wx_vc9_base.vcproj index 4ad7c3ee18..edb1993292 100644 --- a/build/msw/wx_vc9_base.vcproj +++ b/build/msw/wx_vc9_base.vcproj @@ -2,7 +2,7 @@ @@ -1007,10 +1007,10 @@ > - - + + @@ -1240,10 +1240,10 @@ > - - + + @@ -1321,15 +1321,15 @@ - - - - + + + + @@ -1483,10 +1483,10 @@ > - - + + @@ -1636,15 +1636,15 @@ - - - - + + + + @@ -1870,10 +1870,10 @@ > - - + + diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj index 0ecb9c7253..c0f2b84b69 100644 --- a/build/msw/wx_vc9_core.vcproj +++ b/build/msw/wx_vc9_core.vcproj @@ -2,7 +2,7 @@ @@ -6783,6 +6783,10 @@ RelativePath="..\..\include\wx\evtloop.h" > + + diff --git a/build/msw/wx_vc9_gl.vcproj b/build/msw/wx_vc9_gl.vcproj index df5870a6b9..cfc5154349 100644 --- a/build/msw/wx_vc9_gl.vcproj +++ b/build/msw/wx_vc9_gl.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_html.vcproj b/build/msw/wx_vc9_html.vcproj index 9c2911553c..9607c188fe 100644 --- a/build/msw/wx_vc9_html.vcproj +++ b/build/msw/wx_vc9_html.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_media.vcproj b/build/msw/wx_vc9_media.vcproj index 750615ce3e..1f4f029ae3 100644 --- a/build/msw/wx_vc9_media.vcproj +++ b/build/msw/wx_vc9_media.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_net.vcproj b/build/msw/wx_vc9_net.vcproj index f6e37bc984..dbd295a123 100644 --- a/build/msw/wx_vc9_net.vcproj +++ b/build/msw/wx_vc9_net.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_propgrid.vcproj b/build/msw/wx_vc9_propgrid.vcproj index a7b8dddca5..bd55869866 100644 --- a/build/msw/wx_vc9_propgrid.vcproj +++ b/build/msw/wx_vc9_propgrid.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_qa.vcproj b/build/msw/wx_vc9_qa.vcproj index 4e91e49f8d..f7aba83932 100644 --- a/build/msw/wx_vc9_qa.vcproj +++ b/build/msw/wx_vc9_qa.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_ribbon.vcproj b/build/msw/wx_vc9_ribbon.vcproj index d7e4ad0829..355910d99e 100644 --- a/build/msw/wx_vc9_ribbon.vcproj +++ b/build/msw/wx_vc9_ribbon.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_richtext.vcproj b/build/msw/wx_vc9_richtext.vcproj index 16a58bdf97..56ecbd2210 100644 --- a/build/msw/wx_vc9_richtext.vcproj +++ b/build/msw/wx_vc9_richtext.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_stc.vcproj b/build/msw/wx_vc9_stc.vcproj index 026ba68a14..915f87e2e3 100644 --- a/build/msw/wx_vc9_stc.vcproj +++ b/build/msw/wx_vc9_stc.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_wxexpat.vcproj b/build/msw/wx_vc9_wxexpat.vcproj index cd8a1ba930..854aa5ad59 100644 --- a/build/msw/wx_vc9_wxexpat.vcproj +++ b/build/msw/wx_vc9_wxexpat.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_wxjpeg.vcproj b/build/msw/wx_vc9_wxjpeg.vcproj index 678b8ff2d7..102a99ce4e 100644 --- a/build/msw/wx_vc9_wxjpeg.vcproj +++ b/build/msw/wx_vc9_wxjpeg.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_wxpng.vcproj b/build/msw/wx_vc9_wxpng.vcproj index dbc0dec458..5b07f9e611 100644 --- a/build/msw/wx_vc9_wxpng.vcproj +++ b/build/msw/wx_vc9_wxpng.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_wxregex.vcproj b/build/msw/wx_vc9_wxregex.vcproj index 750d13d278..d120cbeba6 100644 --- a/build/msw/wx_vc9_wxregex.vcproj +++ b/build/msw/wx_vc9_wxregex.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_wxscintilla.vcproj b/build/msw/wx_vc9_wxscintilla.vcproj index 9ce2d44124..e4281b0f9c 100644 --- a/build/msw/wx_vc9_wxscintilla.vcproj +++ b/build/msw/wx_vc9_wxscintilla.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_wxtiff.vcproj b/build/msw/wx_vc9_wxtiff.vcproj index 7bb22b64f1..66d01f45c7 100644 --- a/build/msw/wx_vc9_wxtiff.vcproj +++ b/build/msw/wx_vc9_wxtiff.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_wxzlib.vcproj b/build/msw/wx_vc9_wxzlib.vcproj index 7627d46927..0124a7a8fe 100644 --- a/build/msw/wx_vc9_wxzlib.vcproj +++ b/build/msw/wx_vc9_wxzlib.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_xml.vcproj b/build/msw/wx_vc9_xml.vcproj index 33836035bd..632d79d842 100644 --- a/build/msw/wx_vc9_xml.vcproj +++ b/build/msw/wx_vc9_xml.vcproj @@ -2,7 +2,7 @@ diff --git a/build/msw/wx_vc9_xrc.vcproj b/build/msw/wx_vc9_xrc.vcproj index ffb1243fe0..5a64883147 100644 --- a/build/msw/wx_vc9_xrc.vcproj +++ b/build/msw/wx_vc9_xrc.vcproj @@ -2,7 +2,7 @@ diff --git a/configure b/configure index d35cf492f3..0b3295c994 100755 --- a/configure +++ b/configure @@ -48868,7 +48868,7 @@ EOF chmod +x shared-ld-sh SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o" - SHARED_LD_MODULE_CXX="CXX=\$(CXX) $SHARED_LD_MODULE_CC" + SHARED_LD_MODULE_CXX="CXX=\"\$(CXX)\" $SHARED_LD_MODULE_CC" { echo "$as_me:$LINENO: checking for gcc 3.1 or later" >&5 @@ -49975,10 +49975,10 @@ fi - BAKEFILE_BAKEFILE_M4_VERSION="0.2.6" + BAKEFILE_BAKEFILE_M4_VERSION="0.2.7" -BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.6" +BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.7" diff --git a/demos/Makefile.in b/demos/Makefile.in index 605ee0f588..2de247934b 100644 --- a/demos/Makefile.in +++ b/demos/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in index 039a5403ef..6acad57570 100644 --- a/demos/bombs/Makefile.in +++ b/demos/bombs/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/bombs/bombs.dsp b/demos/bombs/bombs.dsp index 275553b1c2..38afe33a5d 100644 --- a/demos/bombs/bombs.dsp +++ b/demos/bombs/bombs.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\bombs" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\bombs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\bombs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\bombs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\bombs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\bombs" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\bombs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\bombs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\bombs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\bombs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\bombs" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\bombs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\bombs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\bombs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\bombs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\bombs" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\bombs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\bombs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\bombs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\bombs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/demos/bombs/bombs_vc7.vcproj b/demos/bombs/bombs_vc7.vcproj index bb26155ce8..6c8f0c5dce 100644 --- a/demos/bombs/bombs_vc7.vcproj +++ b/demos/bombs/bombs_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\bombs.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\bombs.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\bombs.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\bombs.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\bombs.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\bombs.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\bombs.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\bombs.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\bombs.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\bombs.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\bombs.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\bombs.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -BOMBS_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\bombs.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -BOMBS_OBJECTS = \ - $(OBJS)\bombs_bombs.obj \ - $(OBJS)\bombs_bombs1.obj \ - $(OBJS)\bombs_game.obj \ - $(OBJS)\bombs_bombs.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\bombs.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\bombs.exe del $(OBJS)\bombs.exe - -if exist $(OBJS)\bombs.ilk del $(OBJS)\bombs.ilk - -if exist $(OBJS)\bombs.pdb del $(OBJS)\bombs.pdb - -$(OBJS)\bombs.exe: $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\bombs.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(BOMBS_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\bombs_bombs.obj: .\bombs.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BOMBS_CXXFLAGS) .\bombs.cpp - -$(OBJS)\bombs_bombs1.obj: .\bombs1.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BOMBS_CXXFLAGS) .\bombs1.cpp - -$(OBJS)\bombs_game.obj: .\game.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BOMBS_CXXFLAGS) .\game.cpp - -$(OBJS)\bombs_bombs.res: .\bombs.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\bombs.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +BOMBS_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\bombs.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +BOMBS_OBJECTS = \ + $(OBJS)\bombs_bombs.obj \ + $(OBJS)\bombs_bombs1.obj \ + $(OBJS)\bombs_game.obj +BOMBS_RESOURCES = \ + $(OBJS)\bombs_bombs.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\bombs.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\bombs.exe del $(OBJS)\bombs.exe + -if exist $(OBJS)\bombs.ilk del $(OBJS)\bombs.ilk + -if exist $(OBJS)\bombs.pdb del $(OBJS)\bombs.pdb + +$(OBJS)\bombs.exe: $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\bombs.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(BOMBS_OBJECTS) $(BOMBS_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\bombs_bombs.obj: .\bombs.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BOMBS_CXXFLAGS) .\bombs.cpp + +$(OBJS)\bombs_bombs1.obj: .\bombs1.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BOMBS_CXXFLAGS) .\bombs1.cpp + +$(OBJS)\bombs_game.obj: .\game.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BOMBS_CXXFLAGS) .\game.cpp + +$(OBJS)\bombs_bombs.res: .\bombs.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\bombs.rc + diff --git a/demos/bombs/makefile.wat b/demos/bombs/makefile.wat index 0aa4b1dd2e..d2b158217a 100644 --- a/demos/bombs/makefile.wat +++ b/demos/bombs/makefile.wat @@ -1,268 +1,268 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -BOMBS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -BOMBS_OBJECTS = & - $(OBJS)\bombs_bombs.obj & - $(OBJS)\bombs_bombs1.obj & - $(OBJS)\bombs_game.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\bombs.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\bombs.exe del $(OBJS)\bombs.exe - -$(OBJS)\bombs.exe : $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs.res - @%create $(OBJS)\bombs.lbc - @%append $(OBJS)\bombs.lbc option quiet - @%append $(OBJS)\bombs.lbc name $^@ - @%append $(OBJS)\bombs.lbc option caseexact - @%append $(OBJS)\bombs.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(BOMBS_OBJECTS)) do @%append $(OBJS)\bombs.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\bombs.lbc library %i - @%append $(OBJS)\bombs.lbc option resource=$(OBJS)\bombs_bombs.res - @for %i in () do @%append $(OBJS)\bombs.lbc option stack=%i - wlink @$(OBJS)\bombs.lbc - -$(OBJS)\bombs_bombs.obj : .AUTODEPEND .\bombs.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BOMBS_CXXFLAGS) $< - -$(OBJS)\bombs_bombs1.obj : .AUTODEPEND .\bombs1.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BOMBS_CXXFLAGS) $< - -$(OBJS)\bombs_game.obj : .AUTODEPEND .\game.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BOMBS_CXXFLAGS) $< - -$(OBJS)\bombs_bombs.res : .AUTODEPEND .\bombs.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +BOMBS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +BOMBS_OBJECTS = & + $(OBJS)\bombs_bombs.obj & + $(OBJS)\bombs_bombs1.obj & + $(OBJS)\bombs_game.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\bombs.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\bombs.exe del $(OBJS)\bombs.exe + +$(OBJS)\bombs.exe : $(BOMBS_OBJECTS) $(OBJS)\bombs_bombs.res + @%create $(OBJS)\bombs.lbc + @%append $(OBJS)\bombs.lbc option quiet + @%append $(OBJS)\bombs.lbc name $^@ + @%append $(OBJS)\bombs.lbc option caseexact + @%append $(OBJS)\bombs.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(BOMBS_OBJECTS)) do @%append $(OBJS)\bombs.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\bombs.lbc library %i + @%append $(OBJS)\bombs.lbc option resource=$(OBJS)\bombs_bombs.res + @for %i in () do @%append $(OBJS)\bombs.lbc option stack=%i + wlink @$(OBJS)\bombs.lbc + +$(OBJS)\bombs_bombs.obj : .AUTODEPEND .\bombs.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BOMBS_CXXFLAGS) $< + +$(OBJS)\bombs_bombs1.obj : .AUTODEPEND .\bombs1.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BOMBS_CXXFLAGS) $< + +$(OBJS)\bombs_game.obj : .AUTODEPEND .\game.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BOMBS_CXXFLAGS) $< + +$(OBJS)\bombs_bombs.res : .AUTODEPEND .\bombs.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in index 7d57c31878..fb7c708db0 100644 --- a/demos/forty/Makefile.in +++ b/demos/forty/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/forty/forty.dsp b/demos/forty/forty.dsp index c577572ffc..0ecb770d31 100644 --- a/demos/forty/forty.dsp +++ b/demos/forty/forty.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\forty" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\forty.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\forty.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\forty.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\forty.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\forty" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\forty.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\forty.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\forty.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\forty.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\forty" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\forty.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\forty.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\forty.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\forty.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\forty" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\forty.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\forty.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\forty.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\forty.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/demos/forty/forty_vc7.vcproj b/demos/forty/forty_vc7.vcproj index 9e3e99779e..7db1989891 100644 --- a/demos/forty/forty_vc7.vcproj +++ b/demos/forty/forty_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_html.lib wxmsw29u_adv.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\forty.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\forty.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_html.lib wxmsw29u_adv.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\forty.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\forty.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_html.lib wxmsw29u_adv.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\forty.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\forty.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_html.lib wxmswuniv29u_adv.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\forty.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\forty.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_html.lib wxmsw29u_adv.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\forty.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\forty.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_html.lib wxmswuniv29u_adv.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\forty.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\forty.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -FORTY_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\forty.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -FORTY_OBJECTS = \ - $(OBJS)\forty_forty.obj \ - $(OBJS)\forty_canvas.obj \ - $(OBJS)\forty_card.obj \ - $(OBJS)\forty_game.obj \ - $(OBJS)\forty_pile.obj \ - $(OBJS)\forty_playerdg.obj \ - $(OBJS)\forty_scoredg.obj \ - $(OBJS)\forty_scorefil.obj \ - $(OBJS)\forty_forty.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_HTML_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_ADV_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_XML_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\forty.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\forty.exe del $(OBJS)\forty.exe - -if exist $(OBJS)\forty.ilk del $(OBJS)\forty.ilk - -if exist $(OBJS)\forty.pdb del $(OBJS)\forty.pdb - -$(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\forty.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(FORTY_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (about.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\forty_forty.obj: .\forty.cpp - $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\forty.cpp - -$(OBJS)\forty_canvas.obj: .\canvas.cpp - $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\canvas.cpp - -$(OBJS)\forty_card.obj: .\card.cpp - $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\card.cpp - -$(OBJS)\forty_game.obj: .\game.cpp - $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\game.cpp - -$(OBJS)\forty_pile.obj: .\pile.cpp - $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\pile.cpp - -$(OBJS)\forty_playerdg.obj: .\playerdg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\playerdg.cpp - -$(OBJS)\forty_scoredg.obj: .\scoredg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\scoredg.cpp - -$(OBJS)\forty_scorefil.obj: .\scorefil.cpp - $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\scorefil.cpp - -$(OBJS)\forty_forty.res: .\forty.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\forty.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +FORTY_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\forty.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +FORTY_OBJECTS = \ + $(OBJS)\forty_forty.obj \ + $(OBJS)\forty_canvas.obj \ + $(OBJS)\forty_card.obj \ + $(OBJS)\forty_game.obj \ + $(OBJS)\forty_pile.obj \ + $(OBJS)\forty_playerdg.obj \ + $(OBJS)\forty_scoredg.obj \ + $(OBJS)\forty_scorefil.obj +FORTY_RESOURCES = \ + $(OBJS)\forty_forty.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_ADV_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_XML_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\forty.exe data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\forty.exe del $(OBJS)\forty.exe + -if exist $(OBJS)\forty.ilk del $(OBJS)\forty.ilk + -if exist $(OBJS)\forty.pdb del $(OBJS)\forty.pdb + +$(OBJS)\forty.exe: $(FORTY_OBJECTS) $(OBJS)\forty_forty.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\forty.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(FORTY_OBJECTS) $(FORTY_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (about.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\forty_forty.obj: .\forty.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\forty.cpp + +$(OBJS)\forty_canvas.obj: .\canvas.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\canvas.cpp + +$(OBJS)\forty_card.obj: .\card.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\card.cpp + +$(OBJS)\forty_game.obj: .\game.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\game.cpp + +$(OBJS)\forty_pile.obj: .\pile.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\pile.cpp + +$(OBJS)\forty_playerdg.obj: .\playerdg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\playerdg.cpp + +$(OBJS)\forty_scoredg.obj: .\scoredg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\scoredg.cpp + +$(OBJS)\forty_scorefil.obj: .\scorefil.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FORTY_CXXFLAGS) .\scorefil.cpp + +$(OBJS)\forty_forty.res: .\forty.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\forty.rc + diff --git a/demos/forty/makefile.wat b/demos/forty/makefile.wat index 5a13130632..3bf7096c63 100644 --- a/demos/forty/makefile.wat +++ b/demos/forty/makefile.wat @@ -1,307 +1,307 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_ADV_p = -!ifeq MONOLITHIC 0 -__WXLIB_ADV_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -__WXLIB_XML_p = -!ifeq MONOLITHIC 0 -__WXLIB_XML_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -FORTY_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -FORTY_OBJECTS = & - $(OBJS)\forty_forty.obj & - $(OBJS)\forty_canvas.obj & - $(OBJS)\forty_card.obj & - $(OBJS)\forty_game.obj & - $(OBJS)\forty_pile.obj & - $(OBJS)\forty_playerdg.obj & - $(OBJS)\forty_scoredg.obj & - $(OBJS)\forty_scorefil.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\forty.exe data - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\forty.exe del $(OBJS)\forty.exe - -$(OBJS)\forty.exe : $(FORTY_OBJECTS) $(OBJS)\forty_forty.res - @%create $(OBJS)\forty.lbc - @%append $(OBJS)\forty.lbc option quiet - @%append $(OBJS)\forty.lbc name $^@ - @%append $(OBJS)\forty.lbc option caseexact - @%append $(OBJS)\forty.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(FORTY_OBJECTS)) do @%append $(OBJS)\forty.lbc file %i - @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\forty.lbc library %i - @%append $(OBJS)\forty.lbc option resource=$(OBJS)\forty_forty.res - @for %i in () do @%append $(OBJS)\forty.lbc option stack=%i - wlink @$(OBJS)\forty.lbc - -data : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (about.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\forty_forty.obj : .AUTODEPEND .\forty.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $< - -$(OBJS)\forty_canvas.obj : .AUTODEPEND .\canvas.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $< - -$(OBJS)\forty_card.obj : .AUTODEPEND .\card.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $< - -$(OBJS)\forty_game.obj : .AUTODEPEND .\game.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $< - -$(OBJS)\forty_pile.obj : .AUTODEPEND .\pile.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $< - -$(OBJS)\forty_playerdg.obj : .AUTODEPEND .\playerdg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $< - -$(OBJS)\forty_scoredg.obj : .AUTODEPEND .\scoredg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $< - -$(OBJS)\forty_scorefil.obj : .AUTODEPEND .\scorefil.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $< - -$(OBJS)\forty_forty.res : .AUTODEPEND .\forty.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +__WXLIB_XML_p = +!ifeq MONOLITHIC 0 +__WXLIB_XML_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +FORTY_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +FORTY_OBJECTS = & + $(OBJS)\forty_forty.obj & + $(OBJS)\forty_canvas.obj & + $(OBJS)\forty_card.obj & + $(OBJS)\forty_game.obj & + $(OBJS)\forty_pile.obj & + $(OBJS)\forty_playerdg.obj & + $(OBJS)\forty_scoredg.obj & + $(OBJS)\forty_scorefil.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\forty.exe data + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\forty.exe del $(OBJS)\forty.exe + +$(OBJS)\forty.exe : $(FORTY_OBJECTS) $(OBJS)\forty_forty.res + @%create $(OBJS)\forty.lbc + @%append $(OBJS)\forty.lbc option quiet + @%append $(OBJS)\forty.lbc name $^@ + @%append $(OBJS)\forty.lbc option caseexact + @%append $(OBJS)\forty.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(FORTY_OBJECTS)) do @%append $(OBJS)\forty.lbc file %i + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\forty.lbc library %i + @%append $(OBJS)\forty.lbc option resource=$(OBJS)\forty_forty.res + @for %i in () do @%append $(OBJS)\forty.lbc option stack=%i + wlink @$(OBJS)\forty.lbc + +data : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (about.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\forty_forty.obj : .AUTODEPEND .\forty.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $< + +$(OBJS)\forty_canvas.obj : .AUTODEPEND .\canvas.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $< + +$(OBJS)\forty_card.obj : .AUTODEPEND .\card.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $< + +$(OBJS)\forty_game.obj : .AUTODEPEND .\game.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $< + +$(OBJS)\forty_pile.obj : .AUTODEPEND .\pile.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $< + +$(OBJS)\forty_playerdg.obj : .AUTODEPEND .\playerdg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $< + +$(OBJS)\forty_scoredg.obj : .AUTODEPEND .\scoredg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $< + +$(OBJS)\forty_scorefil.obj : .AUTODEPEND .\scorefil.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $< + +$(OBJS)\forty_forty.res : .AUTODEPEND .\forty.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in index 367ab21cd1..af0521d2ec 100644 --- a/demos/fractal/Makefile.in +++ b/demos/fractal/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/fractal/fractal.dsp b/demos/fractal/fractal.dsp index 5aad4c459b..57b43922b1 100644 --- a/demos/fractal/fractal.dsp +++ b/demos/fractal/fractal.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\fractal" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\fractal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\fractal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\fractal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\fractal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\fractal" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\fractal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\fractal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\fractal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\fractal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\fractal" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\fractal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\fractal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\fractal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\fractal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\fractal" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\fractal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\fractal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\fractal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\fractal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/demos/fractal/fractal_vc7.vcproj b/demos/fractal/fractal_vc7.vcproj index 1199047bcd..a6e3931a29 100644 --- a/demos/fractal/fractal_vc7.vcproj +++ b/demos/fractal/fractal_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\fractal.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\fractal.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\fractal.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\fractal.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\fractal.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\fractal.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\fractal.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\fractal.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\fractal.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\fractal.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\fractal.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\fractal.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -FRACTAL_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\fractal.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -FRACTAL_OBJECTS = \ - $(OBJS)\fractal_fractal.obj \ - $(OBJS)\fractal_fractal.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\fractal.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\fractal.exe del $(OBJS)\fractal.exe - -if exist $(OBJS)\fractal.ilk del $(OBJS)\fractal.ilk - -if exist $(OBJS)\fractal.pdb del $(OBJS)\fractal.pdb - -$(OBJS)\fractal.exe: $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\fractal.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(FRACTAL_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\fractal_fractal.obj: .\fractal.cpp - $(CXX) /c /nologo /TP /Fo$@ $(FRACTAL_CXXFLAGS) .\fractal.cpp - -$(OBJS)\fractal_fractal.res: .\fractal.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\fractal.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +FRACTAL_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\fractal.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +FRACTAL_OBJECTS = \ + $(OBJS)\fractal_fractal.obj +FRACTAL_RESOURCES = \ + $(OBJS)\fractal_fractal.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\fractal.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\fractal.exe del $(OBJS)\fractal.exe + -if exist $(OBJS)\fractal.ilk del $(OBJS)\fractal.ilk + -if exist $(OBJS)\fractal.pdb del $(OBJS)\fractal.pdb + +$(OBJS)\fractal.exe: $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\fractal.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(FRACTAL_OBJECTS) $(FRACTAL_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\fractal_fractal.obj: .\fractal.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FRACTAL_CXXFLAGS) .\fractal.cpp + +$(OBJS)\fractal_fractal.res: .\fractal.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\fractal.rc + diff --git a/demos/fractal/makefile.wat b/demos/fractal/makefile.wat index e4e8c1b803..8cc30c61b9 100644 --- a/demos/fractal/makefile.wat +++ b/demos/fractal/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -FRACTAL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -FRACTAL_OBJECTS = & - $(OBJS)\fractal_fractal.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\fractal.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\fractal.exe del $(OBJS)\fractal.exe - -$(OBJS)\fractal.exe : $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal.res - @%create $(OBJS)\fractal.lbc - @%append $(OBJS)\fractal.lbc option quiet - @%append $(OBJS)\fractal.lbc name $^@ - @%append $(OBJS)\fractal.lbc option caseexact - @%append $(OBJS)\fractal.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(FRACTAL_OBJECTS)) do @%append $(OBJS)\fractal.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\fractal.lbc library %i - @%append $(OBJS)\fractal.lbc option resource=$(OBJS)\fractal_fractal.res - @for %i in () do @%append $(OBJS)\fractal.lbc option stack=%i - wlink @$(OBJS)\fractal.lbc - -$(OBJS)\fractal_fractal.obj : .AUTODEPEND .\fractal.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FRACTAL_CXXFLAGS) $< - -$(OBJS)\fractal_fractal.res : .AUTODEPEND .\fractal.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +FRACTAL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +FRACTAL_OBJECTS = & + $(OBJS)\fractal_fractal.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\fractal.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\fractal.exe del $(OBJS)\fractal.exe + +$(OBJS)\fractal.exe : $(FRACTAL_OBJECTS) $(OBJS)\fractal_fractal.res + @%create $(OBJS)\fractal.lbc + @%append $(OBJS)\fractal.lbc option quiet + @%append $(OBJS)\fractal.lbc name $^@ + @%append $(OBJS)\fractal.lbc option caseexact + @%append $(OBJS)\fractal.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(FRACTAL_OBJECTS)) do @%append $(OBJS)\fractal.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\fractal.lbc library %i + @%append $(OBJS)\fractal.lbc option resource=$(OBJS)\fractal_fractal.res + @for %i in () do @%append $(OBJS)\fractal.lbc option stack=%i + wlink @$(OBJS)\fractal.lbc + +$(OBJS)\fractal_fractal.obj : .AUTODEPEND .\fractal.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FRACTAL_CXXFLAGS) $< + +$(OBJS)\fractal_fractal.res : .AUTODEPEND .\fractal.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in index 973f22048e..b8849a498b 100644 --- a/demos/life/Makefile.in +++ b/demos/life/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/life/life.dsp b/demos/life/life.dsp index ff7c537f62..d8f349aec1 100644 --- a/demos/life/life.dsp +++ b/demos/life/life.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\life" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\life.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\life.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\life.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\life.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\life" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\life.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\life.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\life.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\life.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\life" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\life.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\life.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\life.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\life.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\life" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\life.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\life.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\life.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\life.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/demos/life/life_vc7.vcproj b/demos/life/life_vc7.vcproj index 2ebd2e66c8..26243b68c3 100644 --- a/demos/life/life_vc7.vcproj +++ b/demos/life/life_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\life.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\life.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\life.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\life.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\life.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\life.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\life.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\life.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\life.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\life.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\life.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\life.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -LIFE_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\life.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -LIFE_OBJECTS = \ - $(OBJS)\life_life.obj \ - $(OBJS)\life_dialogs.obj \ - $(OBJS)\life_game.obj \ - $(OBJS)\life_reader.obj \ - $(OBJS)\life_life.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\life.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\life.exe del $(OBJS)\life.exe - -if exist $(OBJS)\life.ilk del $(OBJS)\life.ilk - -if exist $(OBJS)\life.pdb del $(OBJS)\life.pdb - -$(OBJS)\life.exe: $(LIFE_OBJECTS) $(OBJS)\life_life.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\life.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(LIFE_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (breeder.lif) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\life_life.obj: .\life.cpp - $(CXX) /c /nologo /TP /Fo$@ $(LIFE_CXXFLAGS) .\life.cpp - -$(OBJS)\life_dialogs.obj: .\dialogs.cpp - $(CXX) /c /nologo /TP /Fo$@ $(LIFE_CXXFLAGS) .\dialogs.cpp - -$(OBJS)\life_game.obj: .\game.cpp - $(CXX) /c /nologo /TP /Fo$@ $(LIFE_CXXFLAGS) .\game.cpp - -$(OBJS)\life_reader.obj: .\reader.cpp - $(CXX) /c /nologo /TP /Fo$@ $(LIFE_CXXFLAGS) .\reader.cpp - -$(OBJS)\life_life.res: .\life.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\life.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +LIFE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\life.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +LIFE_OBJECTS = \ + $(OBJS)\life_life.obj \ + $(OBJS)\life_dialogs.obj \ + $(OBJS)\life_game.obj \ + $(OBJS)\life_reader.obj +LIFE_RESOURCES = \ + $(OBJS)\life_life.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\life.exe data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\life.exe del $(OBJS)\life.exe + -if exist $(OBJS)\life.ilk del $(OBJS)\life.ilk + -if exist $(OBJS)\life.pdb del $(OBJS)\life.pdb + +$(OBJS)\life.exe: $(LIFE_OBJECTS) $(OBJS)\life_life.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\life.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(LIFE_OBJECTS) $(LIFE_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (breeder.lif) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\life_life.obj: .\life.cpp + $(CXX) /c /nologo /TP /Fo$@ $(LIFE_CXXFLAGS) .\life.cpp + +$(OBJS)\life_dialogs.obj: .\dialogs.cpp + $(CXX) /c /nologo /TP /Fo$@ $(LIFE_CXXFLAGS) .\dialogs.cpp + +$(OBJS)\life_game.obj: .\game.cpp + $(CXX) /c /nologo /TP /Fo$@ $(LIFE_CXXFLAGS) .\game.cpp + +$(OBJS)\life_reader.obj: .\reader.cpp + $(CXX) /c /nologo /TP /Fo$@ $(LIFE_CXXFLAGS) .\reader.cpp + +$(OBJS)\life_life.res: .\life.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\life.rc + diff --git a/demos/life/makefile.wat b/demos/life/makefile.wat index fc956d3519..d6c3f42148 100644 --- a/demos/life/makefile.wat +++ b/demos/life/makefile.wat @@ -1,276 +1,276 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -LIFE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -LIFE_OBJECTS = & - $(OBJS)\life_life.obj & - $(OBJS)\life_dialogs.obj & - $(OBJS)\life_game.obj & - $(OBJS)\life_reader.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\life.exe data - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\life.exe del $(OBJS)\life.exe - -$(OBJS)\life.exe : $(LIFE_OBJECTS) $(OBJS)\life_life.res - @%create $(OBJS)\life.lbc - @%append $(OBJS)\life.lbc option quiet - @%append $(OBJS)\life.lbc name $^@ - @%append $(OBJS)\life.lbc option caseexact - @%append $(OBJS)\life.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(LIFE_OBJECTS)) do @%append $(OBJS)\life.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\life.lbc library %i - @%append $(OBJS)\life.lbc option resource=$(OBJS)\life_life.res - @for %i in () do @%append $(OBJS)\life.lbc option stack=%i - wlink @$(OBJS)\life.lbc - -data : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (breeder.lif) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\life_life.obj : .AUTODEPEND .\life.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(LIFE_CXXFLAGS) $< - -$(OBJS)\life_dialogs.obj : .AUTODEPEND .\dialogs.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(LIFE_CXXFLAGS) $< - -$(OBJS)\life_game.obj : .AUTODEPEND .\game.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(LIFE_CXXFLAGS) $< - -$(OBJS)\life_reader.obj : .AUTODEPEND .\reader.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(LIFE_CXXFLAGS) $< - -$(OBJS)\life_life.res : .AUTODEPEND .\life.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +LIFE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +LIFE_OBJECTS = & + $(OBJS)\life_life.obj & + $(OBJS)\life_dialogs.obj & + $(OBJS)\life_game.obj & + $(OBJS)\life_reader.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\life.exe data + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\life.exe del $(OBJS)\life.exe + +$(OBJS)\life.exe : $(LIFE_OBJECTS) $(OBJS)\life_life.res + @%create $(OBJS)\life.lbc + @%append $(OBJS)\life.lbc option quiet + @%append $(OBJS)\life.lbc name $^@ + @%append $(OBJS)\life.lbc option caseexact + @%append $(OBJS)\life.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(LIFE_OBJECTS)) do @%append $(OBJS)\life.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\life.lbc library %i + @%append $(OBJS)\life.lbc option resource=$(OBJS)\life_life.res + @for %i in () do @%append $(OBJS)\life.lbc option stack=%i + wlink @$(OBJS)\life.lbc + +data : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (breeder.lif) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\life_life.obj : .AUTODEPEND .\life.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(LIFE_CXXFLAGS) $< + +$(OBJS)\life_dialogs.obj : .AUTODEPEND .\dialogs.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(LIFE_CXXFLAGS) $< + +$(OBJS)\life_game.obj : .AUTODEPEND .\game.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(LIFE_CXXFLAGS) $< + +$(OBJS)\life_reader.obj : .AUTODEPEND .\reader.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(LIFE_CXXFLAGS) $< + +$(OBJS)\life_life.res : .AUTODEPEND .\life.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/demos/makefile.bcc b/demos/makefile.bcc index 45354712fb..8cd3caa3eb 100644 --- a/demos/makefile.bcc +++ b/demos/makefile.bcc @@ -1,103 +1,103 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -.autodepend - -!ifndef BCCDIR -!ifndef MAKEDIR -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif -BCCDIR = $(MAKEDIR)\.. -!endif - -!include ../build/msw/config.bcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ - -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \ - -DCPP="$(CPP)" -DSHARED="$(SHARED)" -DWXUNIV="$(WXUNIV)" \ - -DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" -DBUILD="$(BUILD)" \ - -DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \ - -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \ - -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \ - -DUSE_AUI="$(USE_AUI)" -DUSE_RIBBON="$(USE_RIBBON)" \ - -DUSE_PROPGRID="$(USE_PROPGRID)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \ - -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \ - -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \ - -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \ - -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \ - -DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \ - -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \ - -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" - -### Conditionally set variables: ### - - - -### Targets: ### - -all: bombs forty fractal life poem - -clean: - -if exist .\*.obj del .\*.obj - -if exist .\*.res del .\*.res - -if exist .\*.csm del .\*.csm - @echo cd bombs >bombs.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>bombs.bat - call bombs.bat - @del bombs.bat - @echo cd forty >forty.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>forty.bat - call forty.bat - @del forty.bat - @echo cd fractal >fractal.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>fractal.bat - call fractal.bat - @del fractal.bat - @echo cd life >life.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>life.bat - call life.bat - @del life.bat - @echo cd poem >poem.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>poem.bat - call poem.bat - @del poem.bat - -bombs: - @echo cd bombs >bombs.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>bombs.bat - call bombs.bat - @del bombs.bat - -forty: - @echo cd forty >forty.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>forty.bat - call forty.bat - @del forty.bat - -fractal: - @echo cd fractal >fractal.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>fractal.bat - call fractal.bat - @del fractal.bat - -life: - @echo cd life >life.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>life.bat - call life.bat - @del life.bat - -poem: - @echo cd poem >poem.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>poem.bat - call poem.bat - @del poem.bat - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +.autodepend + +!ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../build/msw/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ + -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \ + -DCPP="$(CPP)" -DSHARED="$(SHARED)" -DWXUNIV="$(WXUNIV)" \ + -DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" -DBUILD="$(BUILD)" \ + -DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \ + -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \ + -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \ + -DUSE_AUI="$(USE_AUI)" -DUSE_RIBBON="$(USE_RIBBON)" \ + -DUSE_PROPGRID="$(USE_PROPGRID)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \ + -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \ + -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \ + -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \ + -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \ + -DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \ + -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \ + -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" + +### Conditionally set variables: ### + + + +### Targets: ### + +all: bombs forty fractal life poem + +clean: + -if exist .\*.obj del .\*.obj + -if exist .\*.res del .\*.res + -if exist .\*.csm del .\*.csm + @echo cd bombs >bombs.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>bombs.bat + call bombs.bat + @del bombs.bat + @echo cd forty >forty.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>forty.bat + call forty.bat + @del forty.bat + @echo cd fractal >fractal.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>fractal.bat + call fractal.bat + @del fractal.bat + @echo cd life >life.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>life.bat + call life.bat + @del life.bat + @echo cd poem >poem.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>poem.bat + call poem.bat + @del poem.bat + +bombs: + @echo cd bombs >bombs.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>bombs.bat + call bombs.bat + @del bombs.bat + +forty: + @echo cd forty >forty.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>forty.bat + call forty.bat + @del forty.bat + +fractal: + @echo cd fractal >fractal.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>fractal.bat + call fractal.bat + @del fractal.bat + +life: + @echo cd life >life.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>life.bat + call life.bat + @del life.bat + +poem: + @echo cd poem >poem.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>poem.bat + call poem.bat + @del poem.bat + diff --git a/demos/makefile.gcc b/demos/makefile.gcc index 7dc8bec440..445a7f2f81 100644 --- a/demos/makefile.gcc +++ b/demos/makefile.gcc @@ -1,71 +1,71 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -include ../build/msw/config.gcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ - LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \ - CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ - LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" WXUNIV="$(WXUNIV)" \ - UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \ - DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \ - MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ - USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \ - USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \ - USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \ - USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ - USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \ - USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \ - OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \ - WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ - CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ - RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)" - -### Conditionally set variables: ### - - - -### Targets: ### - -all: bombs forty fractal life poem - -clean: - -if exist .\*.o del .\*.o - -if exist .\*.d del .\*.d - $(MAKE) -C bombs -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C forty -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C fractal -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C life -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C poem -f makefile.gcc $(MAKEARGS) clean - -bombs: - $(MAKE) -C bombs -f makefile.gcc $(MAKEARGS) all - -forty: - $(MAKE) -C forty -f makefile.gcc $(MAKEARGS) all - -fractal: - $(MAKE) -C fractal -f makefile.gcc $(MAKEARGS) all - -life: - $(MAKE) -C life -f makefile.gcc $(MAKEARGS) all - -poem: - $(MAKE) -C poem -f makefile.gcc $(MAKEARGS) all - -.PHONY: all clean bombs forty fractal life poem - - -SHELL := $(COMSPEC) - -# Dependencies tracking: --include ./*.d +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../build/msw/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ + LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \ + CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ + LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" WXUNIV="$(WXUNIV)" \ + UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \ + DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \ + MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ + USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \ + USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \ + USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \ + USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ + USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \ + USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \ + OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \ + WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ + CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ + RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)" + +### Conditionally set variables: ### + + + +### Targets: ### + +all: bombs forty fractal life poem + +clean: + -if exist .\*.o del .\*.o + -if exist .\*.d del .\*.d + $(MAKE) -C bombs -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C forty -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C fractal -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C life -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C poem -f makefile.gcc $(MAKEARGS) clean + +bombs: + $(MAKE) -C bombs -f makefile.gcc $(MAKEARGS) all + +forty: + $(MAKE) -C forty -f makefile.gcc $(MAKEARGS) all + +fractal: + $(MAKE) -C fractal -f makefile.gcc $(MAKEARGS) all + +life: + $(MAKE) -C life -f makefile.gcc $(MAKEARGS) all + +poem: + $(MAKE) -C poem -f makefile.gcc $(MAKEARGS) all + +.PHONY: all clean bombs forty fractal life poem + + +SHELL := $(COMSPEC) + +# Dependencies tracking: +-include ./*.d diff --git a/demos/makefile.vc b/demos/makefile.vc index 7d0ce6cf40..4042bd609c 100644 --- a/demos/makefile.vc +++ b/demos/makefile.vc @@ -1,84 +1,84 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include <../build/msw/config.vc> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ - CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \ - WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \ - TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \ - DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \ - MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ - USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \ - USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \ - USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \ - USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ - USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \ - USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \ - OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \ - WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ - CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ - RUNTIME_LIBS="$(RUNTIME_LIBS)" - -### Conditionally set variables: ### - - - -### Targets: ### - -all: sub_bombs sub_forty sub_fractal sub_life sub_poem - -clean: - -if exist .\*.obj del .\*.obj - -if exist .\*.res del .\*.res - -if exist .\*.pch del .\*.pch - cd bombs - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd forty - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd fractal - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd life - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd poem - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - -sub_bombs: - cd bombs - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_forty: - cd forty - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_fractal: - cd fractal - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_life: - cd life - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_poem: - cd poem - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ + CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \ + WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \ + TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \ + DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \ + MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ + USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \ + USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \ + USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \ + USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ + USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \ + USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \ + OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \ + WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ + CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ + RUNTIME_LIBS="$(RUNTIME_LIBS)" + +### Conditionally set variables: ### + + + +### Targets: ### + +all: sub_bombs sub_forty sub_fractal sub_life sub_poem + +clean: + -if exist .\*.obj del .\*.obj + -if exist .\*.res del .\*.res + -if exist .\*.pch del .\*.pch + cd bombs + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd forty + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd fractal + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd life + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd poem + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + +sub_bombs: + cd bombs + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_forty: + cd forty + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_fractal: + cd fractal + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_life: + cd life + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_poem: + cd poem + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + diff --git a/demos/makefile.wat b/demos/makefile.wat index 300d01a04b..cb662fede2 100644 --- a/demos/makefile.wat +++ b/demos/makefile.wat @@ -1,104 +1,104 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - - -### Variables: ### - -MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & - CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" & - WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" & - DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" & - MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" & - USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" & - USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" & - USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" & - USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" & - USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" & - USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" & - OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" & - WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" & - CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" & - RUNTIME_LIBS="$(RUNTIME_LIBS)" - - -### Targets: ### - -all : .SYMBOLIC bombs forty fractal life poem - -clean : .SYMBOLIC - -if exist .\*.obj del .\*.obj - -if exist .\*.res del .\*.res - -if exist .\*.lbc del .\*.lbc - -if exist .\*.ilk del .\*.ilk - -if exist .\*.pch del .\*.pch - cd bombs - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd forty - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd fractal - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd life - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd poem - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - -bombs : .SYMBOLIC - cd bombs - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -forty : .SYMBOLIC - cd forty - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -fractal : .SYMBOLIC - cd fractal - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -life : .SYMBOLIC - cd life - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -poem : .SYMBOLIC - cd poem - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + + +### Variables: ### + +MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & + CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" & + WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" & + DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" & + MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" & + USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" & + USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" & + USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" & + USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" & + USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" & + USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" & + OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" & + WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" & + CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" & + RUNTIME_LIBS="$(RUNTIME_LIBS)" + + +### Targets: ### + +all : .SYMBOLIC bombs forty fractal life poem + +clean : .SYMBOLIC + -if exist .\*.obj del .\*.obj + -if exist .\*.res del .\*.res + -if exist .\*.lbc del .\*.lbc + -if exist .\*.ilk del .\*.ilk + -if exist .\*.pch del .\*.pch + cd bombs + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd forty + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd fractal + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd life + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd poem + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + +bombs : .SYMBOLIC + cd bombs + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +forty : .SYMBOLIC + cd forty + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +fractal : .SYMBOLIC + cd fractal + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +life : .SYMBOLIC + cd life + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +poem : .SYMBOLIC + cd poem + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in index ffba055cc5..251b5ad472 100644 --- a/demos/poem/Makefile.in +++ b/demos/poem/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/demos/poem/makefile.bcc b/demos/poem/makefile.bcc index c9a7898791..3476fdb312 100644 --- a/demos/poem/makefile.bcc +++ b/demos/poem/makefile.bcc @@ -1,240 +1,240 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -.autodepend - -!ifndef BCCDIR -!ifndef MAKEDIR -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif -BCCDIR = $(MAKEDIR)\.. -!endif - -!include ../../build/msw/config.bcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = bcc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXPOEM_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \ - -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS) -WXPOEM_OBJECTS = \ - $(OBJS)\wxpoem_wxpoem.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_2 = -Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_2 = -O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_5 = -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_5 = mt -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_6 = -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_6 = -tWM -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_7 = -tWR -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_7 = -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = i -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = -DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = -dwxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = -DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = -dwxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = -D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = -d_UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = -DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = -dWXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_HTML_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = -v -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = -v- -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO = -v- -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO = -v -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\wxpoem.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.csm del $(OBJS)\*.csm - -if exist $(OBJS)\wxpoem.exe del $(OBJS)\wxpoem.exe - -if exist $(OBJS)\wxpoem.tds del $(OBJS)\wxpoem.tds - -if exist $(OBJS)\wxpoem.ilc del $(OBJS)\wxpoem.ilc - -if exist $(OBJS)\wxpoem.ild del $(OBJS)\wxpoem.ild - -if exist $(OBJS)\wxpoem.ilf del $(OBJS)\wxpoem.ilf - -if exist $(OBJS)\wxpoem.ils del $(OBJS)\wxpoem.ils - -$(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem.res - ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| - c0w32.obj $(WXPOEM_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wxpoem_wxpoem.res -| - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (wxpoem.txt wxpoem.dat) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\wxpoem_wxpoem.obj: .\wxpoem.cpp - $(CXX) -q -c -P -o$@ $(WXPOEM_CXXFLAGS) .\wxpoem.cpp - -$(OBJS)\wxpoem_wxpoem.res: .\wxpoem.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\wxpoem.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +.autodepend + +!ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../build/msw/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = bcc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +WXPOEM_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \ + -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS) +WXPOEM_OBJECTS = \ + $(OBJS)\wxpoem_wxpoem.obj + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_5 = +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_5 = mt +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_6 = +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_6 = -tWM +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_8 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_8 = +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = -DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = -dwxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = -DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = -dwxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -d_UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = -v +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\wxpoem.exe data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.csm del $(OBJS)\*.csm + -if exist $(OBJS)\wxpoem.exe del $(OBJS)\wxpoem.exe + -if exist $(OBJS)\wxpoem.tds del $(OBJS)\wxpoem.tds + -if exist $(OBJS)\wxpoem.ilc del $(OBJS)\wxpoem.ilc + -if exist $(OBJS)\wxpoem.ild del $(OBJS)\wxpoem.ild + -if exist $(OBJS)\wxpoem.ilf del $(OBJS)\wxpoem.ilf + -if exist $(OBJS)\wxpoem.ils del $(OBJS)\wxpoem.ils + +$(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem.res + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| + c0w32.obj $(WXPOEM_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\wxpoem_wxpoem.res +| + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (wxpoem.txt wxpoem.dat) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\wxpoem_wxpoem.obj: .\wxpoem.cpp + $(CXX) -q -c -P -o$@ $(WXPOEM_CXXFLAGS) .\wxpoem.cpp + +$(OBJS)\wxpoem_wxpoem.res: .\wxpoem.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\wxpoem.rc + diff --git a/demos/poem/makefile.gcc b/demos/poem/makefile.gcc index 2326ee3841..3fc5561bf2 100644 --- a/demos/poem/makefile.gcc +++ b/demos/poem/makefile.gcc @@ -1,234 +1,234 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -include ../../build/msw/config.gcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -CPPDEPS = -MT$@ -MF$@.d -MD -MP -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = gcc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXPOEM_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \ - $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) -WXPOEM_OBJECTS = \ - $(OBJS)\wxpoem_wxpoem.o \ - $(OBJS)\wxpoem_wxpoem_rc.o - -### Conditionally set variables: ### - -ifeq ($(GCC_VERSION),2.95) -GCCFLAGS = -fvtable-thunks -endif -ifeq ($(USE_GUI),0) -PORTNAME = base -endif -ifeq ($(USE_GUI),1) -PORTNAME = msw -endif -ifeq ($(BUILD),debug) -WXDEBUGFLAG = d -endif -ifeq ($(UNICODE),1) -WXUNICODEFLAG = u -endif -ifeq ($(WXUNIV),1) -WXUNIVNAME = univ -endif -ifeq ($(SHARED),1) -WXDLLFLAG = dll -endif -ifeq ($(SHARED),0) -LIBTYPE_SUFFIX = lib -endif -ifeq ($(SHARED),1) -LIBTYPE_SUFFIX = dll -endif -ifeq ($(MONOLITHIC),0) -EXTRALIBS_FOR_BASE = -endif -ifeq ($(MONOLITHIC),1) -EXTRALIBS_FOR_BASE = -endif -ifeq ($(BUILD),debug) -__OPTIMIZEFLAG_2 = -O0 -endif -ifeq ($(BUILD),release) -__OPTIMIZEFLAG_2 = -O2 -endif -ifeq ($(USE_RTTI),0) -__RTTIFLAG_5 = -fno-rtti -endif -ifeq ($(USE_RTTI),1) -__RTTIFLAG_5 = -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONSFLAG_6 = -fno-exceptions -endif -ifeq ($(USE_EXCEPTIONS),1) -__EXCEPTIONSFLAG_6 = -endif -ifeq ($(WXUNIV),1) -__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -endif -ifeq ($(WXUNIV),1) -__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ -endif -ifeq ($(DEBUG_FLAG),0) -__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -endif -ifeq ($(DEBUG_FLAG),0) -__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS -endif -ifeq ($(USE_RTTI),0) -__RTTI_DEFINE_p = -DwxNO_RTTI -endif -ifeq ($(USE_RTTI),0) -__RTTI_DEFINE_p_1 = --define wxNO_RTTI -endif -ifeq ($(USE_THREADS),0) -__THREAD_DEFINE_p = -DwxNO_THREADS -endif -ifeq ($(USE_THREADS),0) -__THREAD_DEFINE_p_1 = --define wxNO_THREADS -endif -ifeq ($(UNICODE),0) -__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 -endif -ifeq ($(UNICODE),1) -__UNICODE_DEFINE_p = -D_UNICODE -endif -ifeq ($(UNICODE),0) -__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0 -endif -ifeq ($(UNICODE),1) -__UNICODE_DEFINE_p_1 = --define _UNICODE -endif -ifeq ($(MSLU),1) -__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 -endif -ifeq ($(MSLU),1) -__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1 -endif -ifeq ($(USE_GDIPLUS),1) -__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1 -endif -ifeq ($(USE_GDIPLUS),1) -__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1 -endif -ifeq ($(SHARED),1) -__DLLFLAG_p = -DWXUSINGDLL -endif -ifeq ($(SHARED),1) -__DLLFLAG_p_1 = --define WXUSINGDLL -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_HTML_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_CORE_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_BASE_p = \ - -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -endif -ifeq ($(MONOLITHIC),1) -__WXLIB_MONO_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -endif -ifeq ($(USE_GUI),1) -__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -endif -ifeq ($(USE_GUI),1) -__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -endif -ifeq ($(USE_GUI),1) -__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -endif -ifeq ($(MSLU),1) -__UNICOWS_LIB_p = -lunicows -endif -ifeq ($(USE_GDIPLUS),1) -__GDIPLUS_LIB_p = -lgdiplus -endif -ifeq ($(BUILD),debug) -ifeq ($(DEBUG_INFO),default) -__DEBUGINFO = -g -endif -endif -ifeq ($(BUILD),release) -ifeq ($(DEBUG_INFO),default) -__DEBUGINFO = -endif -endif -ifeq ($(DEBUG_INFO),0) -__DEBUGINFO = -endif -ifeq ($(DEBUG_INFO),1) -__DEBUGINFO = -g -endif -ifeq ($(USE_THREADS),0) -__THREADSFLAG = -endif -ifeq ($(USE_THREADS),1) -__THREADSFLAG = -mthreads -endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\wxpoem.exe data - -clean: - -if exist $(OBJS)\*.o del $(OBJS)\*.o - -if exist $(OBJS)\*.d del $(OBJS)\*.d - -if exist $(OBJS)\wxpoem.exe del $(OBJS)\wxpoem.exe - -$(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem_rc.o - $(CXX) -o $@ $(WXPOEM_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %%f in (wxpoem.txt wxpoem.dat) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) - -$(OBJS)\wxpoem_wxpoem.o: ./wxpoem.cpp - $(CXX) -c -o $@ $(WXPOEM_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxpoem_wxpoem_rc.o: ./wxpoem.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH - -.PHONY: all clean data - - -SHELL := $(COMSPEC) - -# Dependencies tracking: --include $(OBJS)/*.d +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../build/msw/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +CPPDEPS = -MT$@ -MF$@.d -MD -MP +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = gcc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +WXPOEM_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ + $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. \ + $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \ + $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) +WXPOEM_OBJECTS = \ + $(OBJS)\wxpoem_wxpoem.o \ + $(OBJS)\wxpoem_wxpoem_rc.o + +### Conditionally set variables: ### + +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif +ifeq ($(USE_GUI),0) +PORTNAME = base +endif +ifeq ($(USE_GUI),1) +PORTNAME = msw +endif +ifeq ($(BUILD),debug) +WXDEBUGFLAG = d +endif +ifeq ($(UNICODE),1) +WXUNICODEFLAG = u +endif +ifeq ($(WXUNIV),1) +WXUNIVNAME = univ +endif +ifeq ($(SHARED),1) +WXDLLFLAG = dll +endif +ifeq ($(SHARED),0) +LIBTYPE_SUFFIX = lib +endif +ifeq ($(SHARED),1) +LIBTYPE_SUFFIX = dll +endif +ifeq ($(MONOLITHIC),0) +EXTRALIBS_FOR_BASE = +endif +ifeq ($(MONOLITHIC),1) +EXTRALIBS_FOR_BASE = +endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif +ifeq ($(USE_RTTI),0) +__RTTIFLAG_5 = -fno-rtti +endif +ifeq ($(USE_RTTI),1) +__RTTIFLAG_5 = +endif +ifeq ($(USE_EXCEPTIONS),0) +__EXCEPTIONSFLAG_6 = -fno-exceptions +endif +ifeq ($(USE_EXCEPTIONS),1) +__EXCEPTIONSFLAG_6 = +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ +endif +ifeq ($(DEBUG_FLAG),0) +__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 +endif +ifeq ($(DEBUG_FLAG),0) +__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 +endif +ifeq ($(USE_EXCEPTIONS),0) +__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS +endif +ifeq ($(USE_EXCEPTIONS),0) +__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS +endif +ifeq ($(USE_RTTI),0) +__RTTI_DEFINE_p = -DwxNO_RTTI +endif +ifeq ($(USE_RTTI),0) +__RTTI_DEFINE_p_1 = --define wxNO_RTTI +endif +ifeq ($(USE_THREADS),0) +__THREAD_DEFINE_p = -DwxNO_THREADS +endif +ifeq ($(USE_THREADS),0) +__THREAD_DEFINE_p_1 = --define wxNO_THREADS +endif +ifeq ($(UNICODE),0) +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -D_UNICODE +endif +ifeq ($(UNICODE),0) +__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p_1 = --define _UNICODE +endif +ifeq ($(MSLU),1) +__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 +endif +ifeq ($(MSLU),1) +__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1 +endif +ifeq ($(USE_GDIPLUS),1) +__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1 +endif +ifeq ($(USE_GDIPLUS),1) +__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1 +endif +ifeq ($(SHARED),1) +__DLLFLAG_p = -DWXUSINGDLL +endif +ifeq ($(SHARED),1) +__DLLFLAG_p_1 = --define WXUSINGDLL +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_HTML_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = \ + -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) +endif +ifeq ($(MONOLITHIC),1) +__WXLIB_MONO_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) +endif +ifeq ($(USE_GUI),1) +__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +endif +ifeq ($(MSLU),1) +__UNICOWS_LIB_p = -lunicows +endif +ifeq ($(USE_GDIPLUS),1) +__GDIPLUS_LIB_p = -lgdiplus +endif +ifeq ($(BUILD),debug) +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = -g +endif +endif +ifeq ($(BUILD),release) +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = +endif +endif +ifeq ($(DEBUG_INFO),0) +__DEBUGINFO = +endif +ifeq ($(DEBUG_INFO),1) +__DEBUGINFO = -g +endif +ifeq ($(USE_THREADS),0) +__THREADSFLAG = +endif +ifeq ($(USE_THREADS),1) +__THREADSFLAG = -mthreads +endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\wxpoem.exe data + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -if exist $(OBJS)\*.d del $(OBJS)\*.d + -if exist $(OBJS)\wxpoem.exe del $(OBJS)\wxpoem.exe + +$(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem_rc.o + $(CXX) -o $@ $(WXPOEM_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %%f in (wxpoem.txt wxpoem.dat) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) + +$(OBJS)\wxpoem_wxpoem.o: ./wxpoem.cpp + $(CXX) -c -o $@ $(WXPOEM_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\wxpoem_wxpoem_rc.o: ./wxpoem.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH + +.PHONY: all clean data + + +SHELL := $(COMSPEC) + +# Dependencies tracking: +-include $(OBJS)/*.d diff --git a/demos/poem/makefile.vc b/demos/poem/makefile.vc index 3cdf79ecf7..1fae9bca85 100644 --- a/demos/poem/makefile.vc +++ b/demos/poem/makefile.vc @@ -1,319 +1,344 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include <../../build/msw/config.vc> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXPOEM_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\wxpoem.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -WXPOEM_OBJECTS = \ - $(OBJS)\wxpoem_wxpoem.obj \ - $(OBJS)\wxpoem_wxpoem.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_HTML_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\wxpoem.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\wxpoem.exe del $(OBJS)\wxpoem.exe - -if exist $(OBJS)\wxpoem.ilk del $(OBJS)\wxpoem.ilk - -if exist $(OBJS)\wxpoem.pdb del $(OBJS)\wxpoem.pdb - -$(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxpoem.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(WXPOEM_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (wxpoem.txt wxpoem.dat) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\wxpoem_wxpoem.obj: .\wxpoem.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WXPOEM_CXXFLAGS) .\wxpoem.cpp - -$(OBJS)\wxpoem_wxpoem.res: .\wxpoem.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\wxpoem.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +WXPOEM_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\wxpoem.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +WXPOEM_OBJECTS = \ + $(OBJS)\wxpoem_wxpoem.obj +WXPOEM_RESOURCES = \ + $(OBJS)\wxpoem_wxpoem.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\wxpoem.exe data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\wxpoem.exe del $(OBJS)\wxpoem.exe + -if exist $(OBJS)\wxpoem.ilk del $(OBJS)\wxpoem.ilk + -if exist $(OBJS)\wxpoem.pdb del $(OBJS)\wxpoem.pdb + +$(OBJS)\wxpoem.exe: $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxpoem.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(WXPOEM_OBJECTS) $(WXPOEM_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (wxpoem.txt wxpoem.dat) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\wxpoem_wxpoem.obj: .\wxpoem.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXPOEM_CXXFLAGS) .\wxpoem.cpp + +$(OBJS)\wxpoem_wxpoem.res: .\wxpoem.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\wxpoem.rc + diff --git a/demos/poem/makefile.wat b/demos/poem/makefile.wat index 9bfab91310..03a5f4368d 100644 --- a/demos/poem/makefile.wat +++ b/demos/poem/makefile.wat @@ -1,269 +1,269 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXPOEM_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -WXPOEM_OBJECTS = & - $(OBJS)\wxpoem_wxpoem.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\wxpoem.exe data - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\wxpoem.exe del $(OBJS)\wxpoem.exe - -$(OBJS)\wxpoem.exe : $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem.res - @%create $(OBJS)\wxpoem.lbc - @%append $(OBJS)\wxpoem.lbc option quiet - @%append $(OBJS)\wxpoem.lbc name $^@ - @%append $(OBJS)\wxpoem.lbc option caseexact - @%append $(OBJS)\wxpoem.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(WXPOEM_OBJECTS)) do @%append $(OBJS)\wxpoem.lbc file %i - @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\wxpoem.lbc library %i - @%append $(OBJS)\wxpoem.lbc option resource=$(OBJS)\wxpoem_wxpoem.res - @for %i in () do @%append $(OBJS)\wxpoem.lbc option stack=%i - wlink @$(OBJS)\wxpoem.lbc - -data : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (wxpoem.txt wxpoem.dat) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\wxpoem_wxpoem.obj : .AUTODEPEND .\wxpoem.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WXPOEM_CXXFLAGS) $< - -$(OBJS)\wxpoem_wxpoem.res : .AUTODEPEND .\wxpoem.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +WXPOEM_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +WXPOEM_OBJECTS = & + $(OBJS)\wxpoem_wxpoem.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\wxpoem.exe data + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\wxpoem.exe del $(OBJS)\wxpoem.exe + +$(OBJS)\wxpoem.exe : $(WXPOEM_OBJECTS) $(OBJS)\wxpoem_wxpoem.res + @%create $(OBJS)\wxpoem.lbc + @%append $(OBJS)\wxpoem.lbc option quiet + @%append $(OBJS)\wxpoem.lbc name $^@ + @%append $(OBJS)\wxpoem.lbc option caseexact + @%append $(OBJS)\wxpoem.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(WXPOEM_OBJECTS)) do @%append $(OBJS)\wxpoem.lbc file %i + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\wxpoem.lbc library %i + @%append $(OBJS)\wxpoem.lbc option resource=$(OBJS)\wxpoem_wxpoem.res + @for %i in () do @%append $(OBJS)\wxpoem.lbc option stack=%i + wlink @$(OBJS)\wxpoem.lbc + +data : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (wxpoem.txt wxpoem.dat) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\wxpoem_wxpoem.obj : .AUTODEPEND .\wxpoem.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WXPOEM_CXXFLAGS) $< + +$(OBJS)\wxpoem_wxpoem.res : .AUTODEPEND .\wxpoem.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/demos/poem/poem.dsp b/demos/poem/poem.dsp index 5888ba0a07..83d8d3fe7b 100644 --- a/demos/poem/poem.dsp +++ b/demos/poem/poem.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\wxpoem" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wxpoem.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wxpoem.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wxpoem.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wxpoem.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\wxpoem" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wxpoem.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wxpoem.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wxpoem.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wxpoem.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\wxpoem" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wxpoem.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wxpoem.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wxpoem.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wxpoem.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\wxpoem" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\wxpoem.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\wxpoem.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\wxpoem.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\wxpoem.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/demos/poem/poem_vc7.vcproj b/demos/poem/poem_vc7.vcproj index 6f0495a7e9..bbecac175b 100644 --- a/demos/poem/poem_vc7.vcproj +++ b/demos/poem/poem_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\wxpoem.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\wxpoem.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\wxpoem.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\wxpoem.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\wxpoem.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\wxpoem.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\wxpoem.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\wxpoem.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\wxpoem.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\wxpoem.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\wxpoem.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\wxpoem.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\accesstest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\accesstest.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\accesstest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\accesstest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\accesstest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\accesstest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\accesstest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\accesstest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\accesstest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\accesstest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\accesstest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\accesstest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -ACCESSTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\accesstest.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -ACCESSTEST_OBJECTS = \ - $(OBJS)\accesstest_accesstest.obj \ - $(OBJS)\accesstest_accesstest.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\accesstest.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe - -if exist $(OBJS)\accesstest.ilk del $(OBJS)\accesstest.ilk - -if exist $(OBJS)\accesstest.pdb del $(OBJS)\accesstest.pdb - -$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\accesstest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(ACCESSTEST_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\accesstest_accesstest.obj: .\accesstest.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ACCESSTEST_CXXFLAGS) .\accesstest.cpp - -$(OBJS)\accesstest_accesstest.res: .\accesstest.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\accesstest.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +ACCESSTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\accesstest.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +ACCESSTEST_OBJECTS = \ + $(OBJS)\accesstest_accesstest.obj +ACCESSTEST_RESOURCES = \ + $(OBJS)\accesstest_accesstest.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\accesstest.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe + -if exist $(OBJS)\accesstest.ilk del $(OBJS)\accesstest.ilk + -if exist $(OBJS)\accesstest.pdb del $(OBJS)\accesstest.pdb + +$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\accesstest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(ACCESSTEST_OBJECTS) $(ACCESSTEST_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\accesstest_accesstest.obj: .\accesstest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ACCESSTEST_CXXFLAGS) .\accesstest.cpp + +$(OBJS)\accesstest_accesstest.res: .\accesstest.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\accesstest.rc + diff --git a/samples/access/makefile.wat b/samples/access/makefile.wat index c846239c3c..71a525186c 100644 --- a/samples/access/makefile.wat +++ b/samples/access/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -ACCESSTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -ACCESSTEST_OBJECTS = & - $(OBJS)\accesstest_accesstest.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\accesstest.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe - -$(OBJS)\accesstest.exe : $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest.res - @%create $(OBJS)\accesstest.lbc - @%append $(OBJS)\accesstest.lbc option quiet - @%append $(OBJS)\accesstest.lbc name $^@ - @%append $(OBJS)\accesstest.lbc option caseexact - @%append $(OBJS)\accesstest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(ACCESSTEST_OBJECTS)) do @%append $(OBJS)\accesstest.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\accesstest.lbc library %i - @%append $(OBJS)\accesstest.lbc option resource=$(OBJS)\accesstest_accesstest.res - @for %i in () do @%append $(OBJS)\accesstest.lbc option stack=%i - wlink @$(OBJS)\accesstest.lbc - -$(OBJS)\accesstest_accesstest.obj : .AUTODEPEND .\accesstest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ACCESSTEST_CXXFLAGS) $< - -$(OBJS)\accesstest_accesstest.res : .AUTODEPEND .\accesstest.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +ACCESSTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +ACCESSTEST_OBJECTS = & + $(OBJS)\accesstest_accesstest.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\accesstest.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\accesstest.exe del $(OBJS)\accesstest.exe + +$(OBJS)\accesstest.exe : $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest.res + @%create $(OBJS)\accesstest.lbc + @%append $(OBJS)\accesstest.lbc option quiet + @%append $(OBJS)\accesstest.lbc name $^@ + @%append $(OBJS)\accesstest.lbc option caseexact + @%append $(OBJS)\accesstest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(ACCESSTEST_OBJECTS)) do @%append $(OBJS)\accesstest.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\accesstest.lbc library %i + @%append $(OBJS)\accesstest.lbc option resource=$(OBJS)\accesstest_accesstest.res + @for %i in () do @%append $(OBJS)\accesstest.lbc option stack=%i + wlink @$(OBJS)\accesstest.lbc + +$(OBJS)\accesstest_accesstest.obj : .AUTODEPEND .\accesstest.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ACCESSTEST_CXXFLAGS) $< + +$(OBJS)\accesstest_accesstest.res : .AUTODEPEND .\accesstest.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/animate/Makefile.in b/samples/animate/Makefile.in index 24fc6c6450..4dabd60ca6 100644 --- a/samples/animate/Makefile.in +++ b/samples/animate/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/animate/anitest.dsp b/samples/animate/anitest.dsp index f31b1c3f10..96083d9014 100644 --- a/samples/animate/anitest.dsp +++ b/samples/animate/anitest.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\anitest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\anitest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\anitest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\anitest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\anitest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\anitest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\anitest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\anitest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\anitest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\anitest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\anitest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\anitest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\anitest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\anitest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\anitest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\anitest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\anitest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\anitest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\anitest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\anitest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/animate/anitest_vc7.vcproj b/samples/animate/anitest_vc7.vcproj index 7d1b005e6b..ab3f4de18c 100644 --- a/samples/animate/anitest_vc7.vcproj +++ b/samples/animate/anitest_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\anitest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\anitest.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\anitest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\anitest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\anitest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\anitest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\anitest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\anitest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\anitest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\anitest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\anitest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\anitest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -ANITEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\anitest.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -ANITEST_OBJECTS = \ - $(OBJS)\anitest_anitest.obj \ - $(OBJS)\anitest_sample.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_ADV_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\anitest.exe catalog - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\anitest.exe del $(OBJS)\anitest.exe - -if exist $(OBJS)\anitest.ilk del $(OBJS)\anitest.ilk - -if exist $(OBJS)\anitest.pdb del $(OBJS)\anitest.pdb - -$(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\anitest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(ANITEST_OBJECTS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -catalog: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (throbber.gif hourglass.ani) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\anitest_anitest.obj: .\anitest.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ANITEST_CXXFLAGS) .\anitest.cpp - -$(OBJS)\anitest_sample.res: .\..\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +ANITEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\anitest.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +ANITEST_OBJECTS = \ + $(OBJS)\anitest_anitest.obj +ANITEST_RESOURCES = \ + $(OBJS)\anitest_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_ADV_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\anitest.exe catalog + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\anitest.exe del $(OBJS)\anitest.exe + -if exist $(OBJS)\anitest.ilk del $(OBJS)\anitest.ilk + -if exist $(OBJS)\anitest.pdb del $(OBJS)\anitest.pdb + +$(OBJS)\anitest.exe: $(ANITEST_OBJECTS) $(OBJS)\anitest_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\anitest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(ANITEST_OBJECTS) $(ANITEST_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +catalog: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (throbber.gif hourglass.ani) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\anitest_anitest.obj: .\anitest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ANITEST_CXXFLAGS) .\anitest.cpp + +$(OBJS)\anitest_sample.res: .\..\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc + diff --git a/samples/animate/makefile.wat b/samples/animate/makefile.wat index c95dc679c1..c7c46b5475 100644 --- a/samples/animate/makefile.wat +++ b/samples/animate/makefile.wat @@ -1,269 +1,269 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_ADV_p = -!ifeq MONOLITHIC 0 -__WXLIB_ADV_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -ANITEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -ANITEST_OBJECTS = & - $(OBJS)\anitest_anitest.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\anitest.exe catalog - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\anitest.exe del $(OBJS)\anitest.exe - -$(OBJS)\anitest.exe : $(ANITEST_OBJECTS) $(OBJS)\anitest_sample.res - @%create $(OBJS)\anitest.lbc - @%append $(OBJS)\anitest.lbc option quiet - @%append $(OBJS)\anitest.lbc name $^@ - @%append $(OBJS)\anitest.lbc option caseexact - @%append $(OBJS)\anitest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(ANITEST_OBJECTS)) do @%append $(OBJS)\anitest.lbc file %i - @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\anitest.lbc library %i - @%append $(OBJS)\anitest.lbc option resource=$(OBJS)\anitest_sample.res - @for %i in () do @%append $(OBJS)\anitest.lbc option stack=%i - wlink @$(OBJS)\anitest.lbc - -catalog : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (throbber.gif hourglass.ani) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\anitest_anitest.obj : .AUTODEPEND .\anitest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ANITEST_CXXFLAGS) $< - -$(OBJS)\anitest_sample.res : .AUTODEPEND .\..\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +ANITEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +ANITEST_OBJECTS = & + $(OBJS)\anitest_anitest.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\anitest.exe catalog + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\anitest.exe del $(OBJS)\anitest.exe + +$(OBJS)\anitest.exe : $(ANITEST_OBJECTS) $(OBJS)\anitest_sample.res + @%create $(OBJS)\anitest.lbc + @%append $(OBJS)\anitest.lbc option quiet + @%append $(OBJS)\anitest.lbc name $^@ + @%append $(OBJS)\anitest.lbc option caseexact + @%append $(OBJS)\anitest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(ANITEST_OBJECTS)) do @%append $(OBJS)\anitest.lbc file %i + @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\anitest.lbc library %i + @%append $(OBJS)\anitest.lbc option resource=$(OBJS)\anitest_sample.res + @for %i in () do @%append $(OBJS)\anitest.lbc option stack=%i + wlink @$(OBJS)\anitest.lbc + +catalog : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (throbber.gif hourglass.ani) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\anitest_anitest.obj : .AUTODEPEND .\anitest.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ANITEST_CXXFLAGS) $< + +$(OBJS)\anitest_sample.res : .AUTODEPEND .\..\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/artprov/Makefile.in b/samples/artprov/Makefile.in index 30c1aba528..364d944ef6 100644 --- a/samples/artprov/Makefile.in +++ b/samples/artprov/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/artprov/artprov.dsp b/samples/artprov/artprov.dsp index 8c0a173cfd..9e4f822fc6 100644 --- a/samples/artprov/artprov.dsp +++ b/samples/artprov/artprov.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\arttest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\arttest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\arttest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\arttest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\arttest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\arttest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\arttest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\arttest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\arttest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\arttest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\arttest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\arttest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\arttest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\arttest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\arttest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\arttest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\arttest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\arttest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\arttest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\arttest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/artprov/artprov_vc7.vcproj b/samples/artprov/artprov_vc7.vcproj index ad69f21a14..daac2c63df 100644 --- a/samples/artprov/artprov_vc7.vcproj +++ b/samples/artprov/artprov_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\arttest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\arttest.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\arttest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\arttest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\arttest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\arttest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\arttest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\arttest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\arttest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\arttest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\arttest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\arttest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -ARTTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\arttest.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -ARTTEST_OBJECTS = \ - $(OBJS)\arttest_arttest.obj \ - $(OBJS)\arttest_artbrows.obj \ - $(OBJS)\arttest_arttest.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\arttest.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe - -if exist $(OBJS)\arttest.ilk del $(OBJS)\arttest.ilk - -if exist $(OBJS)\arttest.pdb del $(OBJS)\arttest.pdb - -$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\arttest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(ARTTEST_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\arttest_arttest.obj: .\arttest.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ARTTEST_CXXFLAGS) .\arttest.cpp - -$(OBJS)\arttest_artbrows.obj: .\artbrows.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ARTTEST_CXXFLAGS) .\artbrows.cpp - -$(OBJS)\arttest_arttest.res: .\arttest.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\arttest.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +ARTTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\arttest.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +ARTTEST_OBJECTS = \ + $(OBJS)\arttest_arttest.obj \ + $(OBJS)\arttest_artbrows.obj +ARTTEST_RESOURCES = \ + $(OBJS)\arttest_arttest.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\arttest.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe + -if exist $(OBJS)\arttest.ilk del $(OBJS)\arttest.ilk + -if exist $(OBJS)\arttest.pdb del $(OBJS)\arttest.pdb + +$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\arttest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(ARTTEST_OBJECTS) $(ARTTEST_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\arttest_arttest.obj: .\arttest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ARTTEST_CXXFLAGS) .\arttest.cpp + +$(OBJS)\arttest_artbrows.obj: .\artbrows.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ARTTEST_CXXFLAGS) .\artbrows.cpp + +$(OBJS)\arttest_arttest.res: .\arttest.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\arttest.rc + diff --git a/samples/artprov/makefile.wat b/samples/artprov/makefile.wat index 4415719b15..6446d93268 100644 --- a/samples/artprov/makefile.wat +++ b/samples/artprov/makefile.wat @@ -1,264 +1,264 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -ARTTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -ARTTEST_OBJECTS = & - $(OBJS)\arttest_arttest.obj & - $(OBJS)\arttest_artbrows.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\arttest.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe - -$(OBJS)\arttest.exe : $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest.res - @%create $(OBJS)\arttest.lbc - @%append $(OBJS)\arttest.lbc option quiet - @%append $(OBJS)\arttest.lbc name $^@ - @%append $(OBJS)\arttest.lbc option caseexact - @%append $(OBJS)\arttest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(ARTTEST_OBJECTS)) do @%append $(OBJS)\arttest.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\arttest.lbc library %i - @%append $(OBJS)\arttest.lbc option resource=$(OBJS)\arttest_arttest.res - @for %i in () do @%append $(OBJS)\arttest.lbc option stack=%i - wlink @$(OBJS)\arttest.lbc - -$(OBJS)\arttest_arttest.obj : .AUTODEPEND .\arttest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ARTTEST_CXXFLAGS) $< - -$(OBJS)\arttest_artbrows.obj : .AUTODEPEND .\artbrows.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ARTTEST_CXXFLAGS) $< - -$(OBJS)\arttest_arttest.res : .AUTODEPEND .\arttest.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +ARTTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +ARTTEST_OBJECTS = & + $(OBJS)\arttest_arttest.obj & + $(OBJS)\arttest_artbrows.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\arttest.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe + +$(OBJS)\arttest.exe : $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest.res + @%create $(OBJS)\arttest.lbc + @%append $(OBJS)\arttest.lbc option quiet + @%append $(OBJS)\arttest.lbc name $^@ + @%append $(OBJS)\arttest.lbc option caseexact + @%append $(OBJS)\arttest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(ARTTEST_OBJECTS)) do @%append $(OBJS)\arttest.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\arttest.lbc library %i + @%append $(OBJS)\arttest.lbc option resource=$(OBJS)\arttest_arttest.res + @for %i in () do @%append $(OBJS)\arttest.lbc option stack=%i + wlink @$(OBJS)\arttest.lbc + +$(OBJS)\arttest_arttest.obj : .AUTODEPEND .\arttest.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ARTTEST_CXXFLAGS) $< + +$(OBJS)\arttest_artbrows.obj : .AUTODEPEND .\artbrows.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ARTTEST_CXXFLAGS) $< + +$(OBJS)\arttest_arttest.res : .AUTODEPEND .\arttest.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/aui/Makefile.in b/samples/aui/Makefile.in index fab2e785c9..0c2db839c1 100644 --- a/samples/aui/Makefile.in +++ b/samples/aui/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/aui/auidemo.dsp b/samples/aui/auidemo.dsp index 23136a8cc3..80302a4d78 100644 --- a/samples/aui/auidemo.dsp +++ b/samples/aui/auidemo.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\auidemo" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\auidemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\auidemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\auidemo" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\auidemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\auidemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\auidemo" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\auidemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\auidemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\auidemo" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\auidemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\auidemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\auidemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/aui/auidemo_vc7.vcproj b/samples/aui/auidemo_vc7.vcproj index 41e78ad2a1..032f7ff67d 100644 --- a/samples/aui/auidemo_vc7.vcproj +++ b/samples/aui/auidemo_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\auidemo.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\auidemo.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\auidemo.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\auidemo.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\auidemo.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\auidemo.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\auidemo.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\auidemo.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\auidemo.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\auidemo.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\auidemo.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\auidemo.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -AUIDEMO_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\auidemo.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -AUIDEMO_OBJECTS = \ - $(OBJS)\auidemo_sample.res \ - $(OBJS)\auidemo_auidemo.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_AUI_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_HTML_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_ADV_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_XML_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\auidemo.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\auidemo.exe del $(OBJS)\auidemo.exe - -if exist $(OBJS)\auidemo.ilk del $(OBJS)\auidemo.ilk - -if exist $(OBJS)\auidemo.pdb del $(OBJS)\auidemo.pdb - -$(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\auidemo.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(AUIDEMO_OBJECTS) $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\auidemo_sample.res: .\..\..\samples\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc - -$(OBJS)\auidemo_auidemo.obj: .\auidemo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(AUIDEMO_CXXFLAGS) .\auidemo.cpp - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +AUIDEMO_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\auidemo.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +AUIDEMO_OBJECTS = \ + $(OBJS)\auidemo_auidemo.obj +AUIDEMO_RESOURCES = \ + $(OBJS)\auidemo_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_AUI_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_ADV_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_XML_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\auidemo.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\auidemo.exe del $(OBJS)\auidemo.exe + -if exist $(OBJS)\auidemo.ilk del $(OBJS)\auidemo.ilk + -if exist $(OBJS)\auidemo.pdb del $(OBJS)\auidemo.pdb + +$(OBJS)\auidemo.exe: $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\auidemo.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(AUIDEMO_OBJECTS) $(AUIDEMO_RESOURCES) $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\auidemo_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + +$(OBJS)\auidemo_auidemo.obj: .\auidemo.cpp + $(CXX) /c /nologo /TP /Fo$@ $(AUIDEMO_CXXFLAGS) .\auidemo.cpp + diff --git a/samples/aui/makefile.wat b/samples/aui/makefile.wat index ac7dddbd22..ca51e3ba6f 100644 --- a/samples/aui/makefile.wat +++ b/samples/aui/makefile.wat @@ -1,280 +1,280 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_AUI_p = -!ifeq MONOLITHIC 0 -__WXLIB_AUI_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib -!endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_ADV_p = -!ifeq MONOLITHIC 0 -__WXLIB_ADV_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_XML_p = -!ifeq MONOLITHIC 0 -__WXLIB_XML_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -AUIDEMO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -AUIDEMO_OBJECTS = & - $(OBJS)\auidemo_auidemo.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\auidemo.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\auidemo.exe del $(OBJS)\auidemo.exe - -$(OBJS)\auidemo.exe : $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res - @%create $(OBJS)\auidemo.lbc - @%append $(OBJS)\auidemo.lbc option quiet - @%append $(OBJS)\auidemo.lbc name $^@ - @%append $(OBJS)\auidemo.lbc option caseexact - @%append $(OBJS)\auidemo.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(AUIDEMO_OBJECTS)) do @%append $(OBJS)\auidemo.lbc file %i - @for %i in ( $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\auidemo.lbc library %i - @%append $(OBJS)\auidemo.lbc option resource=$(OBJS)\auidemo_sample.res - @for %i in () do @%append $(OBJS)\auidemo.lbc option stack=%i - wlink @$(OBJS)\auidemo.lbc - -$(OBJS)\auidemo_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - -$(OBJS)\auidemo_auidemo.obj : .AUTODEPEND .\auidemo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(AUIDEMO_CXXFLAGS) $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_AUI_p = +!ifeq MONOLITHIC 0 +__WXLIB_AUI_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib +!endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_XML_p = +!ifeq MONOLITHIC 0 +__WXLIB_XML_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +AUIDEMO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +AUIDEMO_OBJECTS = & + $(OBJS)\auidemo_auidemo.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\auidemo.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\auidemo.exe del $(OBJS)\auidemo.exe + +$(OBJS)\auidemo.exe : $(AUIDEMO_OBJECTS) $(OBJS)\auidemo_sample.res + @%create $(OBJS)\auidemo.lbc + @%append $(OBJS)\auidemo.lbc option quiet + @%append $(OBJS)\auidemo.lbc name $^@ + @%append $(OBJS)\auidemo.lbc option caseexact + @%append $(OBJS)\auidemo.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(AUIDEMO_OBJECTS)) do @%append $(OBJS)\auidemo.lbc file %i + @for %i in ( $(__WXLIB_AUI_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\auidemo.lbc library %i + @%append $(OBJS)\auidemo.lbc option resource=$(OBJS)\auidemo_sample.res + @for %i in () do @%append $(OBJS)\auidemo.lbc option stack=%i + wlink @$(OBJS)\auidemo.lbc + +$(OBJS)\auidemo_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + +$(OBJS)\auidemo_auidemo.obj : .AUTODEPEND .\auidemo.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(AUIDEMO_CXXFLAGS) $< + diff --git a/samples/calendar/Makefile.in b/samples/calendar/Makefile.in index ad7fe70e37..55bd98c137 100644 --- a/samples/calendar/Makefile.in +++ b/samples/calendar/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/calendar/calendar.dsp b/samples/calendar/calendar.dsp index 2c289e10d7..5e676d0cc2 100644 --- a/samples/calendar/calendar.dsp +++ b/samples/calendar/calendar.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\calendar" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\calendar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\calendar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\calendar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\calendar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\calendar" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\calendar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\calendar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\calendar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\calendar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\calendar" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\calendar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\calendar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\calendar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\calendar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\calendar" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\calendar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\calendar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\calendar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\calendar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/calendar/calendar_vc7.vcproj b/samples/calendar/calendar_vc7.vcproj index ef0b441b67..8608012248 100644 --- a/samples/calendar/calendar_vc7.vcproj +++ b/samples/calendar/calendar_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\calendar.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\calendar.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\calendar.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\calendar.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\calendar.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\calendar.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\calendar.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\calendar.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\calendar.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\calendar.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\calendar.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\calendar.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -CALENDAR_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\calendar.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -CALENDAR_OBJECTS = \ - $(OBJS)\calendar_calendar.obj \ - $(OBJS)\calendar_calendar.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_ADV_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\calendar.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe - -if exist $(OBJS)\calendar.ilk del $(OBJS)\calendar.ilk - -if exist $(OBJS)\calendar.pdb del $(OBJS)\calendar.pdb - -$(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\calendar.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(CALENDAR_OBJECTS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\calendar_calendar.obj: .\calendar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CALENDAR_CXXFLAGS) .\calendar.cpp - -$(OBJS)\calendar_calendar.res: .\calendar.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\calendar.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +CALENDAR_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\calendar.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +CALENDAR_OBJECTS = \ + $(OBJS)\calendar_calendar.obj +CALENDAR_RESOURCES = \ + $(OBJS)\calendar_calendar.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_ADV_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\calendar.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe + -if exist $(OBJS)\calendar.ilk del $(OBJS)\calendar.ilk + -if exist $(OBJS)\calendar.pdb del $(OBJS)\calendar.pdb + +$(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\calendar.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(CALENDAR_OBJECTS) $(CALENDAR_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\calendar_calendar.obj: .\calendar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CALENDAR_CXXFLAGS) .\calendar.cpp + +$(OBJS)\calendar_calendar.res: .\calendar.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\calendar.rc + diff --git a/samples/calendar/makefile.wat b/samples/calendar/makefile.wat index b35bb0b4d1..d12e37d62b 100644 --- a/samples/calendar/makefile.wat +++ b/samples/calendar/makefile.wat @@ -1,265 +1,265 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_ADV_p = -!ifeq MONOLITHIC 0 -__WXLIB_ADV_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -CALENDAR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -CALENDAR_OBJECTS = & - $(OBJS)\calendar_calendar.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\calendar.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe - -$(OBJS)\calendar.exe : $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar.res - @%create $(OBJS)\calendar.lbc - @%append $(OBJS)\calendar.lbc option quiet - @%append $(OBJS)\calendar.lbc name $^@ - @%append $(OBJS)\calendar.lbc option caseexact - @%append $(OBJS)\calendar.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(CALENDAR_OBJECTS)) do @%append $(OBJS)\calendar.lbc file %i - @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\calendar.lbc library %i - @%append $(OBJS)\calendar.lbc option resource=$(OBJS)\calendar_calendar.res - @for %i in () do @%append $(OBJS)\calendar.lbc option stack=%i - wlink @$(OBJS)\calendar.lbc - -$(OBJS)\calendar_calendar.obj : .AUTODEPEND .\calendar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CALENDAR_CXXFLAGS) $< - -$(OBJS)\calendar_calendar.res : .AUTODEPEND .\calendar.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +CALENDAR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +CALENDAR_OBJECTS = & + $(OBJS)\calendar_calendar.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\calendar.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\calendar.exe del $(OBJS)\calendar.exe + +$(OBJS)\calendar.exe : $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar.res + @%create $(OBJS)\calendar.lbc + @%append $(OBJS)\calendar.lbc option quiet + @%append $(OBJS)\calendar.lbc name $^@ + @%append $(OBJS)\calendar.lbc option caseexact + @%append $(OBJS)\calendar.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(CALENDAR_OBJECTS)) do @%append $(OBJS)\calendar.lbc file %i + @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\calendar.lbc library %i + @%append $(OBJS)\calendar.lbc option resource=$(OBJS)\calendar_calendar.res + @for %i in () do @%append $(OBJS)\calendar.lbc option stack=%i + wlink @$(OBJS)\calendar.lbc + +$(OBJS)\calendar_calendar.obj : .AUTODEPEND .\calendar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CALENDAR_CXXFLAGS) $< + +$(OBJS)\calendar_calendar.res : .AUTODEPEND .\calendar.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in index 0f722cf94a..408aa2a9d3 100644 --- a/samples/caret/Makefile.in +++ b/samples/caret/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/caret/caret.dsp b/samples/caret/caret.dsp index c14d370951..8e092f1913 100644 --- a/samples/caret/caret.dsp +++ b/samples/caret/caret.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\caret" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\caret.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\caret.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\caret.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\caret.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\caret" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\caret.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\caret.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\caret.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\caret.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\caret" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\caret.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\caret.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\caret.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\caret.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\caret" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\caret.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\caret.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\caret.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\caret.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/caret/caret_vc7.vcproj b/samples/caret/caret_vc7.vcproj index cc542867ae..f0a66908ad 100644 --- a/samples/caret/caret_vc7.vcproj +++ b/samples/caret/caret_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\caret.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\caret.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\caret.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\caret.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\caret.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\caret.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\caret.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\caret.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\caret.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\caret.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\caret.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\caret.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -CARET_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\caret.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -CARET_OBJECTS = \ - $(OBJS)\caret_caret.obj \ - $(OBJS)\caret_caret.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\caret.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe - -if exist $(OBJS)\caret.ilk del $(OBJS)\caret.ilk - -if exist $(OBJS)\caret.pdb del $(OBJS)\caret.pdb - -$(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_caret.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\caret.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(CARET_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\caret_caret.obj: .\caret.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CARET_CXXFLAGS) .\caret.cpp - -$(OBJS)\caret_caret.res: .\caret.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\caret.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +CARET_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\caret.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +CARET_OBJECTS = \ + $(OBJS)\caret_caret.obj +CARET_RESOURCES = \ + $(OBJS)\caret_caret.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\caret.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe + -if exist $(OBJS)\caret.ilk del $(OBJS)\caret.ilk + -if exist $(OBJS)\caret.pdb del $(OBJS)\caret.pdb + +$(OBJS)\caret.exe: $(CARET_OBJECTS) $(OBJS)\caret_caret.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\caret.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(CARET_OBJECTS) $(CARET_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\caret_caret.obj: .\caret.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CARET_CXXFLAGS) .\caret.cpp + +$(OBJS)\caret_caret.res: .\caret.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\caret.rc + diff --git a/samples/caret/makefile.wat b/samples/caret/makefile.wat index ab1c7b3864..e1dc30f1f9 100644 --- a/samples/caret/makefile.wat +++ b/samples/caret/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -CARET_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -CARET_OBJECTS = & - $(OBJS)\caret_caret.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\caret.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe - -$(OBJS)\caret.exe : $(CARET_OBJECTS) $(OBJS)\caret_caret.res - @%create $(OBJS)\caret.lbc - @%append $(OBJS)\caret.lbc option quiet - @%append $(OBJS)\caret.lbc name $^@ - @%append $(OBJS)\caret.lbc option caseexact - @%append $(OBJS)\caret.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(CARET_OBJECTS)) do @%append $(OBJS)\caret.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\caret.lbc library %i - @%append $(OBJS)\caret.lbc option resource=$(OBJS)\caret_caret.res - @for %i in () do @%append $(OBJS)\caret.lbc option stack=%i - wlink @$(OBJS)\caret.lbc - -$(OBJS)\caret_caret.obj : .AUTODEPEND .\caret.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CARET_CXXFLAGS) $< - -$(OBJS)\caret_caret.res : .AUTODEPEND .\caret.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +CARET_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +CARET_OBJECTS = & + $(OBJS)\caret_caret.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\caret.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\caret.exe del $(OBJS)\caret.exe + +$(OBJS)\caret.exe : $(CARET_OBJECTS) $(OBJS)\caret_caret.res + @%create $(OBJS)\caret.lbc + @%append $(OBJS)\caret.lbc option quiet + @%append $(OBJS)\caret.lbc name $^@ + @%append $(OBJS)\caret.lbc option caseexact + @%append $(OBJS)\caret.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(CARET_OBJECTS)) do @%append $(OBJS)\caret.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\caret.lbc library %i + @%append $(OBJS)\caret.lbc option resource=$(OBJS)\caret_caret.res + @for %i in () do @%append $(OBJS)\caret.lbc option stack=%i + wlink @$(OBJS)\caret.lbc + +$(OBJS)\caret_caret.obj : .AUTODEPEND .\caret.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CARET_CXXFLAGS) $< + +$(OBJS)\caret_caret.res : .AUTODEPEND .\caret.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/clipboard/Makefile.in b/samples/clipboard/Makefile.in index ae523f0211..564248d1a2 100644 --- a/samples/clipboard/Makefile.in +++ b/samples/clipboard/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/clipboard/clipboard.dsp b/samples/clipboard/clipboard.dsp index 0073ee59dc..18f764dac2 100644 --- a/samples/clipboard/clipboard.dsp +++ b/samples/clipboard/clipboard.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\clipboard" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\clipboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\clipboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\clipboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\clipboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\clipboard" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\clipboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\clipboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\clipboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\clipboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\clipboard" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\clipboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\clipboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\clipboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\clipboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\clipboard" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\clipboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\clipboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\clipboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\clipboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/clipboard/clipboard_vc7.vcproj b/samples/clipboard/clipboard_vc7.vcproj index 2ca8596582..729d59093b 100644 --- a/samples/clipboard/clipboard_vc7.vcproj +++ b/samples/clipboard/clipboard_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\clipboard.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\clipboard.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\clipboard.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\clipboard.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\clipboard.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\clipboard.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\clipboard.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\clipboard.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\clipboard.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\clipboard.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\clipboard.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\clipboard.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -CLIPBOARD_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\clipboard.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -CLIPBOARD_OBJECTS = \ - $(OBJS)\clipboard_clipboard.obj \ - $(OBJS)\clipboard_clipboard.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\clipboard.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\clipboard.exe del $(OBJS)\clipboard.exe - -if exist $(OBJS)\clipboard.ilk del $(OBJS)\clipboard.ilk - -if exist $(OBJS)\clipboard.pdb del $(OBJS)\clipboard.pdb - -$(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_clipboard.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\clipboard.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(CLIPBOARD_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\clipboard_clipboard.obj: .\clipboard.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CLIPBOARD_CXXFLAGS) .\clipboard.cpp - -$(OBJS)\clipboard_clipboard.res: .\clipboard.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\clipboard.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +CLIPBOARD_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\clipboard.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +CLIPBOARD_OBJECTS = \ + $(OBJS)\clipboard_clipboard.obj +CLIPBOARD_RESOURCES = \ + $(OBJS)\clipboard_clipboard.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\clipboard.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\clipboard.exe del $(OBJS)\clipboard.exe + -if exist $(OBJS)\clipboard.ilk del $(OBJS)\clipboard.ilk + -if exist $(OBJS)\clipboard.pdb del $(OBJS)\clipboard.pdb + +$(OBJS)\clipboard.exe: $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_clipboard.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\clipboard.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(CLIPBOARD_OBJECTS) $(CLIPBOARD_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\clipboard_clipboard.obj: .\clipboard.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CLIPBOARD_CXXFLAGS) .\clipboard.cpp + +$(OBJS)\clipboard_clipboard.res: .\clipboard.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\clipboard.rc + diff --git a/samples/clipboard/makefile.wat b/samples/clipboard/makefile.wat index 075e2c6978..f6e4bb1b13 100644 --- a/samples/clipboard/makefile.wat +++ b/samples/clipboard/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -CLIPBOARD_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -CLIPBOARD_OBJECTS = & - $(OBJS)\clipboard_clipboard.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\clipboard.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\clipboard.exe del $(OBJS)\clipboard.exe - -$(OBJS)\clipboard.exe : $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_clipboard.res - @%create $(OBJS)\clipboard.lbc - @%append $(OBJS)\clipboard.lbc option quiet - @%append $(OBJS)\clipboard.lbc name $^@ - @%append $(OBJS)\clipboard.lbc option caseexact - @%append $(OBJS)\clipboard.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(CLIPBOARD_OBJECTS)) do @%append $(OBJS)\clipboard.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\clipboard.lbc library %i - @%append $(OBJS)\clipboard.lbc option resource=$(OBJS)\clipboard_clipboard.res - @for %i in () do @%append $(OBJS)\clipboard.lbc option stack=%i - wlink @$(OBJS)\clipboard.lbc - -$(OBJS)\clipboard_clipboard.obj : .AUTODEPEND .\clipboard.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CLIPBOARD_CXXFLAGS) $< - -$(OBJS)\clipboard_clipboard.res : .AUTODEPEND .\clipboard.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +CLIPBOARD_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +CLIPBOARD_OBJECTS = & + $(OBJS)\clipboard_clipboard.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\clipboard.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\clipboard.exe del $(OBJS)\clipboard.exe + +$(OBJS)\clipboard.exe : $(CLIPBOARD_OBJECTS) $(OBJS)\clipboard_clipboard.res + @%create $(OBJS)\clipboard.lbc + @%append $(OBJS)\clipboard.lbc option quiet + @%append $(OBJS)\clipboard.lbc name $^@ + @%append $(OBJS)\clipboard.lbc option caseexact + @%append $(OBJS)\clipboard.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(CLIPBOARD_OBJECTS)) do @%append $(OBJS)\clipboard.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\clipboard.lbc library %i + @%append $(OBJS)\clipboard.lbc option resource=$(OBJS)\clipboard_clipboard.res + @for %i in () do @%append $(OBJS)\clipboard.lbc option stack=%i + wlink @$(OBJS)\clipboard.lbc + +$(OBJS)\clipboard_clipboard.obj : .AUTODEPEND .\clipboard.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CLIPBOARD_CXXFLAGS) $< + +$(OBJS)\clipboard_clipboard.res : .AUTODEPEND .\clipboard.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/collpane/Makefile.in b/samples/collpane/Makefile.in index bac9bf2b71..d4c08f0922 100644 --- a/samples/collpane/Makefile.in +++ b/samples/collpane/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/collpane/collpane.dsp b/samples/collpane/collpane.dsp index 138aba0645..ccc8315db0 100644 --- a/samples/collpane/collpane.dsp +++ b/samples/collpane/collpane.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\collpane" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\collpane.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\collpane.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\collpane.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\collpane.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\collpane" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\collpane.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\collpane.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\collpane.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\collpane.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\collpane" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\collpane.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\collpane.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\collpane.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\collpane.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\collpane" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\collpane.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\collpane.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\collpane.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\collpane.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/collpane/collpane_vc7.vcproj b/samples/collpane/collpane_vc7.vcproj index 77c7f49d8f..42bf1463f7 100644 --- a/samples/collpane/collpane_vc7.vcproj +++ b/samples/collpane/collpane_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\collpane.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\collpane.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\collpane.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\collpane.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\collpane.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\collpane.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\collpane.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\collpane.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\collpane.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\collpane.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\collpane.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\collpane.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -COLLPANE_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\collpane.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -COLLPANE_OBJECTS = \ - $(OBJS)\collpane_collpane.obj \ - $(OBJS)\collpane_sample.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_ADV_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\collpane.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\collpane.exe del $(OBJS)\collpane.exe - -if exist $(OBJS)\collpane.ilk del $(OBJS)\collpane.ilk - -if exist $(OBJS)\collpane.pdb del $(OBJS)\collpane.pdb - -$(OBJS)\collpane.exe: $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\collpane.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(COLLPANE_OBJECTS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\collpane_collpane.obj: .\collpane.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COLLPANE_CXXFLAGS) .\collpane.cpp - -$(OBJS)\collpane_sample.res: .\..\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +COLLPANE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\collpane.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +COLLPANE_OBJECTS = \ + $(OBJS)\collpane_collpane.obj +COLLPANE_RESOURCES = \ + $(OBJS)\collpane_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_ADV_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\collpane.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\collpane.exe del $(OBJS)\collpane.exe + -if exist $(OBJS)\collpane.ilk del $(OBJS)\collpane.ilk + -if exist $(OBJS)\collpane.pdb del $(OBJS)\collpane.pdb + +$(OBJS)\collpane.exe: $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\collpane.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(COLLPANE_OBJECTS) $(COLLPANE_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\collpane_collpane.obj: .\collpane.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COLLPANE_CXXFLAGS) .\collpane.cpp + +$(OBJS)\collpane_sample.res: .\..\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc + diff --git a/samples/collpane/makefile.wat b/samples/collpane/makefile.wat index 9159afc514..7a74c93bee 100644 --- a/samples/collpane/makefile.wat +++ b/samples/collpane/makefile.wat @@ -1,265 +1,265 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_ADV_p = -!ifeq MONOLITHIC 0 -__WXLIB_ADV_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -COLLPANE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -COLLPANE_OBJECTS = & - $(OBJS)\collpane_collpane.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\collpane.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\collpane.exe del $(OBJS)\collpane.exe - -$(OBJS)\collpane.exe : $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample.res - @%create $(OBJS)\collpane.lbc - @%append $(OBJS)\collpane.lbc option quiet - @%append $(OBJS)\collpane.lbc name $^@ - @%append $(OBJS)\collpane.lbc option caseexact - @%append $(OBJS)\collpane.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(COLLPANE_OBJECTS)) do @%append $(OBJS)\collpane.lbc file %i - @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\collpane.lbc library %i - @%append $(OBJS)\collpane.lbc option resource=$(OBJS)\collpane_sample.res - @for %i in () do @%append $(OBJS)\collpane.lbc option stack=%i - wlink @$(OBJS)\collpane.lbc - -$(OBJS)\collpane_collpane.obj : .AUTODEPEND .\collpane.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COLLPANE_CXXFLAGS) $< - -$(OBJS)\collpane_sample.res : .AUTODEPEND .\..\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +COLLPANE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +COLLPANE_OBJECTS = & + $(OBJS)\collpane_collpane.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\collpane.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\collpane.exe del $(OBJS)\collpane.exe + +$(OBJS)\collpane.exe : $(COLLPANE_OBJECTS) $(OBJS)\collpane_sample.res + @%create $(OBJS)\collpane.lbc + @%append $(OBJS)\collpane.lbc option quiet + @%append $(OBJS)\collpane.lbc name $^@ + @%append $(OBJS)\collpane.lbc option caseexact + @%append $(OBJS)\collpane.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(COLLPANE_OBJECTS)) do @%append $(OBJS)\collpane.lbc file %i + @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\collpane.lbc library %i + @%append $(OBJS)\collpane.lbc option resource=$(OBJS)\collpane_sample.res + @for %i in () do @%append $(OBJS)\collpane.lbc option stack=%i + wlink @$(OBJS)\collpane.lbc + +$(OBJS)\collpane_collpane.obj : .AUTODEPEND .\collpane.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COLLPANE_CXXFLAGS) $< + +$(OBJS)\collpane_sample.res : .AUTODEPEND .\..\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/combo/Makefile.in b/samples/combo/Makefile.in index 2261788326..ea355c98d0 100644 --- a/samples/combo/Makefile.in +++ b/samples/combo/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/combo/combo.dsp b/samples/combo/combo.dsp index d2d276652b..e5532e5e11 100644 --- a/samples/combo/combo.dsp +++ b/samples/combo/combo.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\combo" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\combo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\combo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\combo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\combo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\combo" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\combo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\combo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\combo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\combo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\combo" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\combo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\combo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\combo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\combo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\combo" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\combo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\combo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\combo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\combo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/combo/combo_vc7.vcproj b/samples/combo/combo_vc7.vcproj index 5ff053e177..b685f1e906 100644 --- a/samples/combo/combo_vc7.vcproj +++ b/samples/combo/combo_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\combo.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\combo.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\combo.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\combo.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\combo.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\combo.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\combo.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\combo.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\combo.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\combo.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\combo.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\combo.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -COMBO_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\combo.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -COMBO_OBJECTS = \ - $(OBJS)\combo_sample.res \ - $(OBJS)\combo_combo.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_ADV_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\combo.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\combo.exe del $(OBJS)\combo.exe - -if exist $(OBJS)\combo.ilk del $(OBJS)\combo.ilk - -if exist $(OBJS)\combo.pdb del $(OBJS)\combo.pdb - -$(OBJS)\combo.exe: $(COMBO_OBJECTS) $(OBJS)\combo_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\combo.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(COMBO_OBJECTS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (dropbuth.png dropbutn.png dropbutp.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\combo_sample.res: .\..\..\samples\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc - -$(OBJS)\combo_combo.obj: .\combo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COMBO_CXXFLAGS) .\combo.cpp - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +COMBO_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\combo.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +COMBO_OBJECTS = \ + $(OBJS)\combo_combo.obj +COMBO_RESOURCES = \ + $(OBJS)\combo_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_ADV_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\combo.exe data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\combo.exe del $(OBJS)\combo.exe + -if exist $(OBJS)\combo.ilk del $(OBJS)\combo.ilk + -if exist $(OBJS)\combo.pdb del $(OBJS)\combo.pdb + +$(OBJS)\combo.exe: $(COMBO_OBJECTS) $(OBJS)\combo_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\combo.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(COMBO_OBJECTS) $(COMBO_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (dropbuth.png dropbutn.png dropbutp.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\combo_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + +$(OBJS)\combo_combo.obj: .\combo.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COMBO_CXXFLAGS) .\combo.cpp + diff --git a/samples/combo/makefile.wat b/samples/combo/makefile.wat index 0bce691605..d3f5857bd3 100644 --- a/samples/combo/makefile.wat +++ b/samples/combo/makefile.wat @@ -1,269 +1,269 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_ADV_p = -!ifeq MONOLITHIC 0 -__WXLIB_ADV_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -COMBO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -COMBO_OBJECTS = & - $(OBJS)\combo_combo.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\combo.exe data - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\combo.exe del $(OBJS)\combo.exe - -$(OBJS)\combo.exe : $(COMBO_OBJECTS) $(OBJS)\combo_sample.res - @%create $(OBJS)\combo.lbc - @%append $(OBJS)\combo.lbc option quiet - @%append $(OBJS)\combo.lbc name $^@ - @%append $(OBJS)\combo.lbc option caseexact - @%append $(OBJS)\combo.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(COMBO_OBJECTS)) do @%append $(OBJS)\combo.lbc file %i - @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\combo.lbc library %i - @%append $(OBJS)\combo.lbc option resource=$(OBJS)\combo_sample.res - @for %i in () do @%append $(OBJS)\combo.lbc option stack=%i - wlink @$(OBJS)\combo.lbc - -data : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (dropbuth.png dropbutn.png dropbutp.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\combo_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - -$(OBJS)\combo_combo.obj : .AUTODEPEND .\combo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COMBO_CXXFLAGS) $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +COMBO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +COMBO_OBJECTS = & + $(OBJS)\combo_combo.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\combo.exe data + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\combo.exe del $(OBJS)\combo.exe + +$(OBJS)\combo.exe : $(COMBO_OBJECTS) $(OBJS)\combo_sample.res + @%create $(OBJS)\combo.lbc + @%append $(OBJS)\combo.lbc option quiet + @%append $(OBJS)\combo.lbc name $^@ + @%append $(OBJS)\combo.lbc option caseexact + @%append $(OBJS)\combo.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(COMBO_OBJECTS)) do @%append $(OBJS)\combo.lbc file %i + @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\combo.lbc library %i + @%append $(OBJS)\combo.lbc option resource=$(OBJS)\combo_sample.res + @for %i in () do @%append $(OBJS)\combo.lbc option stack=%i + wlink @$(OBJS)\combo.lbc + +data : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (dropbuth.png dropbutn.png dropbutp.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\combo_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + +$(OBJS)\combo_combo.obj : .AUTODEPEND .\combo.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COMBO_CXXFLAGS) $< + diff --git a/samples/config/Makefile.in b/samples/config/Makefile.in index 9e465d6763..a446ced98c 100644 --- a/samples/config/Makefile.in +++ b/samples/config/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/config/config.dsp b/samples/config/config.dsp index ad48f47d2c..a74ee79f31 100644 --- a/samples/config/config.dsp +++ b/samples/config/config.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\conftest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\conftest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\conftest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\conftest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\conftest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\conftest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\conftest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\conftest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\conftest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\conftest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\conftest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\conftest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\conftest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\conftest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\conftest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\conftest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\conftest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\conftest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\conftest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\conftest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/config/config_vc7.vcproj b/samples/config/config_vc7.vcproj index 685d88d812..f5e3fe1c7a 100644 --- a/samples/config/config_vc7.vcproj +++ b/samples/config/config_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\conftest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\conftest.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\conftest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\conftest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\conftest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\conftest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\conftest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\conftest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\conftest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\conftest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\conftest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\conftest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -CONFTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\conftest.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -CONFTEST_OBJECTS = \ - $(OBJS)\conftest_conftest.obj \ - $(OBJS)\conftest_conftest.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\conftest.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe - -if exist $(OBJS)\conftest.ilk del $(OBJS)\conftest.ilk - -if exist $(OBJS)\conftest.pdb del $(OBJS)\conftest.pdb - -$(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\conftest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(CONFTEST_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\conftest_conftest.obj: .\conftest.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CONFTEST_CXXFLAGS) .\conftest.cpp - -$(OBJS)\conftest_conftest.res: .\conftest.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\conftest.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +CONFTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\conftest.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +CONFTEST_OBJECTS = \ + $(OBJS)\conftest_conftest.obj +CONFTEST_RESOURCES = \ + $(OBJS)\conftest_conftest.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\conftest.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe + -if exist $(OBJS)\conftest.ilk del $(OBJS)\conftest.ilk + -if exist $(OBJS)\conftest.pdb del $(OBJS)\conftest.pdb + +$(OBJS)\conftest.exe: $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\conftest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(CONFTEST_OBJECTS) $(CONFTEST_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\conftest_conftest.obj: .\conftest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CONFTEST_CXXFLAGS) .\conftest.cpp + +$(OBJS)\conftest_conftest.res: .\conftest.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\conftest.rc + diff --git a/samples/config/makefile.wat b/samples/config/makefile.wat index f7f3c8da92..0ea631ee0a 100644 --- a/samples/config/makefile.wat +++ b/samples/config/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -CONFTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -CONFTEST_OBJECTS = & - $(OBJS)\conftest_conftest.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\conftest.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe - -$(OBJS)\conftest.exe : $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest.res - @%create $(OBJS)\conftest.lbc - @%append $(OBJS)\conftest.lbc option quiet - @%append $(OBJS)\conftest.lbc name $^@ - @%append $(OBJS)\conftest.lbc option caseexact - @%append $(OBJS)\conftest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(CONFTEST_OBJECTS)) do @%append $(OBJS)\conftest.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\conftest.lbc library %i - @%append $(OBJS)\conftest.lbc option resource=$(OBJS)\conftest_conftest.res - @for %i in () do @%append $(OBJS)\conftest.lbc option stack=%i - wlink @$(OBJS)\conftest.lbc - -$(OBJS)\conftest_conftest.obj : .AUTODEPEND .\conftest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CONFTEST_CXXFLAGS) $< - -$(OBJS)\conftest_conftest.res : .AUTODEPEND .\conftest.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +CONFTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +CONFTEST_OBJECTS = & + $(OBJS)\conftest_conftest.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\conftest.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\conftest.exe del $(OBJS)\conftest.exe + +$(OBJS)\conftest.exe : $(CONFTEST_OBJECTS) $(OBJS)\conftest_conftest.res + @%create $(OBJS)\conftest.lbc + @%append $(OBJS)\conftest.lbc option quiet + @%append $(OBJS)\conftest.lbc name $^@ + @%append $(OBJS)\conftest.lbc option caseexact + @%append $(OBJS)\conftest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(CONFTEST_OBJECTS)) do @%append $(OBJS)\conftest.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\conftest.lbc library %i + @%append $(OBJS)\conftest.lbc option resource=$(OBJS)\conftest_conftest.res + @for %i in () do @%append $(OBJS)\conftest.lbc option stack=%i + wlink @$(OBJS)\conftest.lbc + +$(OBJS)\conftest_conftest.obj : .AUTODEPEND .\conftest.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CONFTEST_CXXFLAGS) $< + +$(OBJS)\conftest_conftest.res : .AUTODEPEND .\conftest.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/console/Makefile.in b/samples/console/Makefile.in index 027ff36641..893b4a6f46 100644 --- a/samples/console/Makefile.in +++ b/samples/console/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/console/console.dsp b/samples/console/console.dsp index ff03c8c169..94db907193 100644 --- a/samples/console/console.dsp +++ b/samples/console/console.dsp @@ -46,8 +46,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\console" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\console.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\console.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\console.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\console.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe @@ -92,8 +92,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\console" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\console.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\console.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\console.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\console.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe @@ -138,8 +138,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\console" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\console.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\console.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\console.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\console.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe @@ -184,8 +184,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\console" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\console.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\console.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\console.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\console.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe diff --git a/samples/console/console_vc7.vcproj b/samples/console/console_vc7.vcproj index 50251e0b8d..143ab0376c 100644 --- a/samples/console/console_vc7.vcproj +++ b/samples/console/console_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\console.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\console.pdb" SubSystem="1" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\console.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\console.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\console.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\console.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\console.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\console.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\console.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\console.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\console.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\console.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -CONSOLE_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\console.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) \ - $(CXXFLAGS) -CONSOLE_OBJECTS = \ - $(OBJS)\console_console.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_NET_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\console.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\console.exe del $(OBJS)\console.exe - -if exist $(OBJS)\console.ilk del $(OBJS)\console.ilk - -if exist $(OBJS)\console.pdb del $(OBJS)\console.pdb - -$(OBJS)\console.exe: $(CONSOLE_OBJECTS) - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\console.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< - $(CONSOLE_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\console_console.obj: .\console.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CONSOLE_CXXFLAGS) .\console.cpp - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +CONSOLE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\console.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +CONSOLE_OBJECTS = \ + $(OBJS)\console_console.obj + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_NET_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\console.exe data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\console.exe del $(OBJS)\console.exe + -if exist $(OBJS)\console.ilk del $(OBJS)\console.ilk + -if exist $(OBJS)\console.pdb del $(OBJS)\console.pdb + +$(OBJS)\console.exe: $(CONSOLE_OBJECTS) + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\console.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< + $(CONSOLE_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\console_console.obj: .\console.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CONSOLE_CXXFLAGS) .\console.cpp + diff --git a/samples/console/makefile.wat b/samples/console/makefile.wat index 2cb5fcc544..06f6824b07 100644 --- a/samples/console/makefile.wat +++ b/samples/console/makefile.wat @@ -1,248 +1,248 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif -__WXLIB_NET_p = -!ifeq MONOLITHIC 0 -__WXLIB_NET_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -CONSOLE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -dwxUSE_GUI=0 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) -CONSOLE_OBJECTS = & - $(OBJS)\console_console.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\console.exe data - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\console.exe del $(OBJS)\console.exe - -$(OBJS)\console.exe : $(CONSOLE_OBJECTS) - @%create $(OBJS)\console.lbc - @%append $(OBJS)\console.lbc option quiet - @%append $(OBJS)\console.lbc name $^@ - @%append $(OBJS)\console.lbc option caseexact - @%append $(OBJS)\console.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) - @for %i in ($(CONSOLE_OBJECTS)) do @%append $(OBJS)\console.lbc file %i - @for %i in ( $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\console.lbc library %i - @%append $(OBJS)\console.lbc - @for %i in () do @%append $(OBJS)\console.lbc option stack=%i - wlink @$(OBJS)\console.lbc - -data : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\console_console.obj : .AUTODEPEND .\console.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CONSOLE_CXXFLAGS) $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__WXLIB_NET_p = +!ifeq MONOLITHIC 0 +__WXLIB_NET_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +CONSOLE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -dwxUSE_GUI=0 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) +CONSOLE_OBJECTS = & + $(OBJS)\console_console.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\console.exe data + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\console.exe del $(OBJS)\console.exe + +$(OBJS)\console.exe : $(CONSOLE_OBJECTS) + @%create $(OBJS)\console.lbc + @%append $(OBJS)\console.lbc option quiet + @%append $(OBJS)\console.lbc name $^@ + @%append $(OBJS)\console.lbc option caseexact + @%append $(OBJS)\console.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) + @for %i in ($(CONSOLE_OBJECTS)) do @%append $(OBJS)\console.lbc file %i + @for %i in ( $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\console.lbc library %i + @%append $(OBJS)\console.lbc + @for %i in () do @%append $(OBJS)\console.lbc option stack=%i + wlink @$(OBJS)\console.lbc + +data : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\console_console.obj : .AUTODEPEND .\console.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CONSOLE_CXXFLAGS) $< + diff --git a/samples/controls/Makefile.in b/samples/controls/Makefile.in index 246a46fddb..25017d04bc 100644 --- a/samples/controls/Makefile.in +++ b/samples/controls/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/controls/controls.dsp b/samples/controls/controls.dsp index 02475cc464..13e4505ca1 100644 --- a/samples/controls/controls.dsp +++ b/samples/controls/controls.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\controls" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\controls.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\controls.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\controls.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\controls.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\controls" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\controls.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\controls.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\controls.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\controls.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\controls" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\controls.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\controls.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\controls.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\controls.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\controls" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\controls.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\controls.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\controls.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\controls.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/controls/controls_vc7.vcproj b/samples/controls/controls_vc7.vcproj index 6f28abbcbb..0698d3544e 100644 --- a/samples/controls/controls_vc7.vcproj +++ b/samples/controls/controls_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\controls.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\controls.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\controls.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\controls.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\controls.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\controls.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\controls.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\controls.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\controls.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\controls.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\controls.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\controls.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -CONTROLS_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\controls.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -CONTROLS_OBJECTS = \ - $(OBJS)\controls_controls.obj \ - $(OBJS)\controls_controls.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\controls.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\controls.exe del $(OBJS)\controls.exe - -if exist $(OBJS)\controls.ilk del $(OBJS)\controls.ilk - -if exist $(OBJS)\controls.pdb del $(OBJS)\controls.pdb - -$(OBJS)\controls.exe: $(CONTROLS_OBJECTS) $(OBJS)\controls_controls.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\controls.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(CONTROLS_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (test2.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\controls_controls.obj: .\controls.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CONTROLS_CXXFLAGS) .\controls.cpp - -$(OBJS)\controls_controls.res: .\controls.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\controls.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +CONTROLS_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\controls.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +CONTROLS_OBJECTS = \ + $(OBJS)\controls_controls.obj +CONTROLS_RESOURCES = \ + $(OBJS)\controls_controls.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\controls.exe data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\controls.exe del $(OBJS)\controls.exe + -if exist $(OBJS)\controls.ilk del $(OBJS)\controls.ilk + -if exist $(OBJS)\controls.pdb del $(OBJS)\controls.pdb + +$(OBJS)\controls.exe: $(CONTROLS_OBJECTS) $(OBJS)\controls_controls.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\controls.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(CONTROLS_OBJECTS) $(CONTROLS_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (test2.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\controls_controls.obj: .\controls.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CONTROLS_CXXFLAGS) .\controls.cpp + +$(OBJS)\controls_controls.res: .\controls.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\controls.rc + diff --git a/samples/controls/makefile.wat b/samples/controls/makefile.wat index 2acdcea053..da9d9532e0 100644 --- a/samples/controls/makefile.wat +++ b/samples/controls/makefile.wat @@ -1,264 +1,264 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -CONTROLS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -CONTROLS_OBJECTS = & - $(OBJS)\controls_controls.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\controls.exe data - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\controls.exe del $(OBJS)\controls.exe - -$(OBJS)\controls.exe : $(CONTROLS_OBJECTS) $(OBJS)\controls_controls.res - @%create $(OBJS)\controls.lbc - @%append $(OBJS)\controls.lbc option quiet - @%append $(OBJS)\controls.lbc name $^@ - @%append $(OBJS)\controls.lbc option caseexact - @%append $(OBJS)\controls.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(CONTROLS_OBJECTS)) do @%append $(OBJS)\controls.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\controls.lbc library %i - @%append $(OBJS)\controls.lbc option resource=$(OBJS)\controls_controls.res - @for %i in () do @%append $(OBJS)\controls.lbc option stack=%i - wlink @$(OBJS)\controls.lbc - -data : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (test2.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\controls_controls.obj : .AUTODEPEND .\controls.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CONTROLS_CXXFLAGS) $< - -$(OBJS)\controls_controls.res : .AUTODEPEND .\controls.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +CONTROLS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +CONTROLS_OBJECTS = & + $(OBJS)\controls_controls.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\controls.exe data + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\controls.exe del $(OBJS)\controls.exe + +$(OBJS)\controls.exe : $(CONTROLS_OBJECTS) $(OBJS)\controls_controls.res + @%create $(OBJS)\controls.lbc + @%append $(OBJS)\controls.lbc option quiet + @%append $(OBJS)\controls.lbc name $^@ + @%append $(OBJS)\controls.lbc option caseexact + @%append $(OBJS)\controls.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(CONTROLS_OBJECTS)) do @%append $(OBJS)\controls.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\controls.lbc library %i + @%append $(OBJS)\controls.lbc option resource=$(OBJS)\controls_controls.res + @for %i in () do @%append $(OBJS)\controls.lbc option stack=%i + wlink @$(OBJS)\controls.lbc + +data : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (test2.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\controls_controls.obj : .AUTODEPEND .\controls.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CONTROLS_CXXFLAGS) $< + +$(OBJS)\controls_controls.res : .AUTODEPEND .\controls.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/dataview/Makefile.in b/samples/dataview/Makefile.in index e964e605e5..3265c5fa2d 100644 --- a/samples/dataview/Makefile.in +++ b/samples/dataview/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dataview/dataview.dsp b/samples/dataview/dataview.dsp index d09352a224..b7b4a67efe 100644 --- a/samples/dataview/dataview.dsp +++ b/samples/dataview/dataview.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\dataview" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dataview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dataview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dataview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dataview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\dataview" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dataview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dataview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dataview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dataview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\dataview" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dataview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dataview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dataview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dataview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\dataview" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\dataview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\dataview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\dataview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\dataview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/dataview/dataview_vc7.vcproj b/samples/dataview/dataview_vc7.vcproj index 03fa11f024..bc3954e308 100644 --- a/samples/dataview/dataview_vc7.vcproj +++ b/samples/dataview/dataview_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\dataview.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\dataview.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\dataview.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\dataview.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\dataview.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\dataview.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\dataview.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\dataview.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\dataview.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\dataview.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\dataview.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\dataview.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -DATAVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\dataview.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -DATAVIEW_OBJECTS = \ - $(OBJS)\dataview_dataview.obj \ - $(OBJS)\dataview_mymodels.obj \ - $(OBJS)\dataview_sample.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_ADV_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\dataview.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\dataview.exe del $(OBJS)\dataview.exe - -if exist $(OBJS)\dataview.ilk del $(OBJS)\dataview.ilk - -if exist $(OBJS)\dataview.pdb del $(OBJS)\dataview.pdb - -$(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\dataview.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(DATAVIEW_OBJECTS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\dataview_dataview.obj: .\dataview.cpp - $(CXX) /c /nologo /TP /Fo$@ $(DATAVIEW_CXXFLAGS) .\dataview.cpp - -$(OBJS)\dataview_mymodels.obj: .\mymodels.cpp - $(CXX) /c /nologo /TP /Fo$@ $(DATAVIEW_CXXFLAGS) .\mymodels.cpp - -$(OBJS)\dataview_sample.res: .\..\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +DATAVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\dataview.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +DATAVIEW_OBJECTS = \ + $(OBJS)\dataview_dataview.obj \ + $(OBJS)\dataview_mymodels.obj +DATAVIEW_RESOURCES = \ + $(OBJS)\dataview_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_ADV_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\dataview.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\dataview.exe del $(OBJS)\dataview.exe + -if exist $(OBJS)\dataview.ilk del $(OBJS)\dataview.ilk + -if exist $(OBJS)\dataview.pdb del $(OBJS)\dataview.pdb + +$(OBJS)\dataview.exe: $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\dataview.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(DATAVIEW_OBJECTS) $(DATAVIEW_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\dataview_dataview.obj: .\dataview.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DATAVIEW_CXXFLAGS) .\dataview.cpp + +$(OBJS)\dataview_mymodels.obj: .\mymodels.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DATAVIEW_CXXFLAGS) .\mymodels.cpp + +$(OBJS)\dataview_sample.res: .\..\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc + diff --git a/samples/dataview/makefile.wat b/samples/dataview/makefile.wat index f2a44ca3e0..2ce4205dfe 100644 --- a/samples/dataview/makefile.wat +++ b/samples/dataview/makefile.wat @@ -1,269 +1,269 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_ADV_p = -!ifeq MONOLITHIC 0 -__WXLIB_ADV_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -DATAVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -DATAVIEW_OBJECTS = & - $(OBJS)\dataview_dataview.obj & - $(OBJS)\dataview_mymodels.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\dataview.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\dataview.exe del $(OBJS)\dataview.exe - -$(OBJS)\dataview.exe : $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample.res - @%create $(OBJS)\dataview.lbc - @%append $(OBJS)\dataview.lbc option quiet - @%append $(OBJS)\dataview.lbc name $^@ - @%append $(OBJS)\dataview.lbc option caseexact - @%append $(OBJS)\dataview.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(DATAVIEW_OBJECTS)) do @%append $(OBJS)\dataview.lbc file %i - @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\dataview.lbc library %i - @%append $(OBJS)\dataview.lbc option resource=$(OBJS)\dataview_sample.res - @for %i in () do @%append $(OBJS)\dataview.lbc option stack=%i - wlink @$(OBJS)\dataview.lbc - -$(OBJS)\dataview_dataview.obj : .AUTODEPEND .\dataview.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DATAVIEW_CXXFLAGS) $< - -$(OBJS)\dataview_mymodels.obj : .AUTODEPEND .\mymodels.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DATAVIEW_CXXFLAGS) $< - -$(OBJS)\dataview_sample.res : .AUTODEPEND .\..\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +DATAVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +DATAVIEW_OBJECTS = & + $(OBJS)\dataview_dataview.obj & + $(OBJS)\dataview_mymodels.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\dataview.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\dataview.exe del $(OBJS)\dataview.exe + +$(OBJS)\dataview.exe : $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample.res + @%create $(OBJS)\dataview.lbc + @%append $(OBJS)\dataview.lbc option quiet + @%append $(OBJS)\dataview.lbc name $^@ + @%append $(OBJS)\dataview.lbc option caseexact + @%append $(OBJS)\dataview.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(DATAVIEW_OBJECTS)) do @%append $(OBJS)\dataview.lbc file %i + @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\dataview.lbc library %i + @%append $(OBJS)\dataview.lbc option resource=$(OBJS)\dataview_sample.res + @for %i in () do @%append $(OBJS)\dataview.lbc option stack=%i + wlink @$(OBJS)\dataview.lbc + +$(OBJS)\dataview_dataview.obj : .AUTODEPEND .\dataview.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(DATAVIEW_CXXFLAGS) $< + +$(OBJS)\dataview_mymodels.obj : .AUTODEPEND .\mymodels.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(DATAVIEW_CXXFLAGS) $< + +$(OBJS)\dataview_sample.res : .AUTODEPEND .\..\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/debugrpt/Makefile.in b/samples/debugrpt/Makefile.in index 8863fc00bd..32eb45d426 100644 --- a/samples/debugrpt/Makefile.in +++ b/samples/debugrpt/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/debugrpt/debugrpt.dsp b/samples/debugrpt/debugrpt.dsp index a4894fb3c4..4b96e4246b 100644 --- a/samples/debugrpt/debugrpt.dsp +++ b/samples/debugrpt/debugrpt.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\debugrpt" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\debugrpt.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\debugrpt.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\debugrpt.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\debugrpt.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\debugrpt" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\debugrpt.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\debugrpt.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\debugrpt.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\debugrpt.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\debugrpt" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\debugrpt.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\debugrpt.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\debugrpt.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\debugrpt.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\debugrpt" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\debugrpt.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\debugrpt.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\debugrpt.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\debugrpt.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/debugrpt/debugrpt_vc7.vcproj b/samples/debugrpt/debugrpt_vc7.vcproj index bf2628d5a5..eabc82052b 100644 --- a/samples/debugrpt/debugrpt_vc7.vcproj +++ b/samples/debugrpt/debugrpt_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\debugrpt.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\debugrpt.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\debugrpt.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\debugrpt.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\debugrpt.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\debugrpt.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\debugrpt.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\debugrpt.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\debugrpt.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\debugrpt.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\debugrpt.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\debugrpt.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -DEBUGRPT_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\debugrpt.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -DEBUGRPT_OBJECTS = \ - $(OBJS)\debugrpt_sample.res \ - $(OBJS)\debugrpt_debugrpt.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_QA_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_XML_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\debugrpt.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\debugrpt.exe del $(OBJS)\debugrpt.exe - -if exist $(OBJS)\debugrpt.ilk del $(OBJS)\debugrpt.ilk - -if exist $(OBJS)\debugrpt.pdb del $(OBJS)\debugrpt.pdb - -$(OBJS)\debugrpt.exe: $(DEBUGRPT_OBJECTS) $(OBJS)\debugrpt_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\debugrpt.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(DEBUGRPT_OBJECTS) $(__WXLIB_QA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\debugrpt_sample.res: .\..\..\samples\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc - -$(OBJS)\debugrpt_debugrpt.obj: .\debugrpt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(DEBUGRPT_CXXFLAGS) .\debugrpt.cpp - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +DEBUGRPT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\debugrpt.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +DEBUGRPT_OBJECTS = \ + $(OBJS)\debugrpt_debugrpt.obj +DEBUGRPT_RESOURCES = \ + $(OBJS)\debugrpt_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_QA_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_XML_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\debugrpt.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\debugrpt.exe del $(OBJS)\debugrpt.exe + -if exist $(OBJS)\debugrpt.ilk del $(OBJS)\debugrpt.ilk + -if exist $(OBJS)\debugrpt.pdb del $(OBJS)\debugrpt.pdb + +$(OBJS)\debugrpt.exe: $(DEBUGRPT_OBJECTS) $(OBJS)\debugrpt_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\debugrpt.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(DEBUGRPT_OBJECTS) $(DEBUGRPT_RESOURCES) $(__WXLIB_QA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\debugrpt_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + +$(OBJS)\debugrpt_debugrpt.obj: .\debugrpt.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DEBUGRPT_CXXFLAGS) .\debugrpt.cpp + diff --git a/samples/debugrpt/makefile.wat b/samples/debugrpt/makefile.wat index 9d2669d960..bd1c9b93e4 100644 --- a/samples/debugrpt/makefile.wat +++ b/samples/debugrpt/makefile.wat @@ -1,270 +1,270 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_QA_p = -!ifeq MONOLITHIC 0 -__WXLIB_QA_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_XML_p = -!ifeq MONOLITHIC 0 -__WXLIB_XML_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -DEBUGRPT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -DEBUGRPT_OBJECTS = & - $(OBJS)\debugrpt_debugrpt.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\debugrpt.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\debugrpt.exe del $(OBJS)\debugrpt.exe - -$(OBJS)\debugrpt.exe : $(DEBUGRPT_OBJECTS) $(OBJS)\debugrpt_sample.res - @%create $(OBJS)\debugrpt.lbc - @%append $(OBJS)\debugrpt.lbc option quiet - @%append $(OBJS)\debugrpt.lbc name $^@ - @%append $(OBJS)\debugrpt.lbc option caseexact - @%append $(OBJS)\debugrpt.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(DEBUGRPT_OBJECTS)) do @%append $(OBJS)\debugrpt.lbc file %i - @for %i in ( $(__WXLIB_QA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\debugrpt.lbc library %i - @%append $(OBJS)\debugrpt.lbc option resource=$(OBJS)\debugrpt_sample.res - @for %i in () do @%append $(OBJS)\debugrpt.lbc option stack=%i - wlink @$(OBJS)\debugrpt.lbc - -$(OBJS)\debugrpt_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - -$(OBJS)\debugrpt_debugrpt.obj : .AUTODEPEND .\debugrpt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DEBUGRPT_CXXFLAGS) $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_QA_p = +!ifeq MONOLITHIC 0 +__WXLIB_QA_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_XML_p = +!ifeq MONOLITHIC 0 +__WXLIB_XML_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +DEBUGRPT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +DEBUGRPT_OBJECTS = & + $(OBJS)\debugrpt_debugrpt.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\debugrpt.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\debugrpt.exe del $(OBJS)\debugrpt.exe + +$(OBJS)\debugrpt.exe : $(DEBUGRPT_OBJECTS) $(OBJS)\debugrpt_sample.res + @%create $(OBJS)\debugrpt.lbc + @%append $(OBJS)\debugrpt.lbc option quiet + @%append $(OBJS)\debugrpt.lbc name $^@ + @%append $(OBJS)\debugrpt.lbc option caseexact + @%append $(OBJS)\debugrpt.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(DEBUGRPT_OBJECTS)) do @%append $(OBJS)\debugrpt.lbc file %i + @for %i in ( $(__WXLIB_QA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_XML_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\debugrpt.lbc library %i + @%append $(OBJS)\debugrpt.lbc option resource=$(OBJS)\debugrpt_sample.res + @for %i in () do @%append $(OBJS)\debugrpt.lbc option stack=%i + wlink @$(OBJS)\debugrpt.lbc + +$(OBJS)\debugrpt_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + +$(OBJS)\debugrpt_debugrpt.obj : .AUTODEPEND .\debugrpt.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(DEBUGRPT_CXXFLAGS) $< + diff --git a/samples/dialogs/Makefile.in b/samples/dialogs/Makefile.in index 44ac0dfe5f..f837c99079 100644 --- a/samples/dialogs/Makefile.in +++ b/samples/dialogs/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dialogs/dialogs.dsp b/samples/dialogs/dialogs.dsp index 8b56376d1f..6baca81c9c 100644 --- a/samples/dialogs/dialogs.dsp +++ b/samples/dialogs/dialogs.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\dialogs" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dialogs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dialogs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dialogs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dialogs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\dialogs" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dialogs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dialogs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dialogs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dialogs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\dialogs" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dialogs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dialogs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dialogs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dialogs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\dialogs" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\dialogs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\dialogs.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\dialogs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\dialogs.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/dialogs/dialogs_vc7.vcproj b/samples/dialogs/dialogs_vc7.vcproj index b6d844f835..03acaab7f1 100644 --- a/samples/dialogs/dialogs_vc7.vcproj +++ b/samples/dialogs/dialogs_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\dialogs.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\dialogs.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\dialogs.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\dialogs.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\dialogs.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\dialogs.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\dialogs.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\dialogs.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\dialogs.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\dialogs.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\dialogs.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\dialogs.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -DIALOGS_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\dialogs.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -DIALOGS_OBJECTS = \ - $(OBJS)\dialogs_dialogs.obj \ - $(____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS) \ - $(OBJS)\dialogs_dialogs.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(SHARED)" == "0" && "$(WXUNIV)" == "0" -____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = \ - $(OBJS)\dialogs_colrdlgg.obj \ - $(OBJS)\dialogs_dirdlgg.obj \ - $(OBJS)\dialogs_filedlgg.obj \ - $(OBJS)\dialogs_fontdlgg.obj -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_ADV_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\dialogs.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe - -if exist $(OBJS)\dialogs.ilk del $(OBJS)\dialogs.ilk - -if exist $(OBJS)\dialogs.pdb del $(OBJS)\dialogs.pdb - -$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\dialogs.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(DIALOGS_OBJECTS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\dialogs_dialogs.obj: .\dialogs.cpp - $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\dialogs.cpp - -$(OBJS)\dialogs_colrdlgg.obj: .\..\..\src\generic\colrdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\colrdlgg.cpp - -$(OBJS)\dialogs_dirdlgg.obj: .\..\..\src\generic\dirdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\dirdlgg.cpp - -$(OBJS)\dialogs_filedlgg.obj: .\..\..\src\generic\filedlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\filedlgg.cpp - -$(OBJS)\dialogs_fontdlgg.obj: .\..\..\src\generic\fontdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\fontdlgg.cpp - -$(OBJS)\dialogs_dialogs.res: .\dialogs.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\dialogs.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +DIALOGS_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\dialogs.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +DIALOGS_OBJECTS = \ + $(OBJS)\dialogs_dialogs.obj \ + $(____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS) +DIALOGS_RESOURCES = \ + $(OBJS)\dialogs_dialogs.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(SHARED)" == "0" && "$(WXUNIV)" == "0" +____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = \ + $(OBJS)\dialogs_colrdlgg.obj \ + $(OBJS)\dialogs_dirdlgg.obj \ + $(OBJS)\dialogs_filedlgg.obj \ + $(OBJS)\dialogs_fontdlgg.obj +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_ADV_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\dialogs.exe data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe + -if exist $(OBJS)\dialogs.ilk del $(OBJS)\dialogs.ilk + -if exist $(OBJS)\dialogs.pdb del $(OBJS)\dialogs.pdb + +$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\dialogs.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(DIALOGS_OBJECTS) $(DIALOGS_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\dialogs_dialogs.obj: .\dialogs.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\dialogs.cpp + +$(OBJS)\dialogs_colrdlgg.obj: .\..\..\src\generic\colrdlgg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\colrdlgg.cpp + +$(OBJS)\dialogs_dirdlgg.obj: .\..\..\src\generic\dirdlgg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\dirdlgg.cpp + +$(OBJS)\dialogs_filedlgg.obj: .\..\..\src\generic\filedlgg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\filedlgg.cpp + +$(OBJS)\dialogs_fontdlgg.obj: .\..\..\src\generic\fontdlgg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\fontdlgg.cpp + +$(OBJS)\dialogs_dialogs.res: .\dialogs.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\dialogs.rc + diff --git a/samples/dialogs/makefile.wat b/samples/dialogs/makefile.wat index 03a1b68d09..e5284c29b8 100644 --- a/samples/dialogs/makefile.wat +++ b/samples/dialogs/makefile.wat @@ -1,292 +1,292 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = -!ifeq SHARED 0 -!ifeq WXUNIV 0 -____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = & - $(OBJS)\dialogs_colrdlgg.obj & - $(OBJS)\dialogs_dirdlgg.obj & - $(OBJS)\dialogs_filedlgg.obj & - $(OBJS)\dialogs_fontdlgg.obj -!endif -!endif -__WXLIB_ADV_p = -!ifeq MONOLITHIC 0 -__WXLIB_ADV_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -DIALOGS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -DIALOGS_OBJECTS = & - $(OBJS)\dialogs_dialogs.obj & - $(____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS) - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\dialogs.exe data - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe - -$(OBJS)\dialogs.exe : $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res - @%create $(OBJS)\dialogs.lbc - @%append $(OBJS)\dialogs.lbc option quiet - @%append $(OBJS)\dialogs.lbc name $^@ - @%append $(OBJS)\dialogs.lbc option caseexact - @%append $(OBJS)\dialogs.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(DIALOGS_OBJECTS)) do @%append $(OBJS)\dialogs.lbc file %i - @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\dialogs.lbc library %i - @%append $(OBJS)\dialogs.lbc option resource=$(OBJS)\dialogs_dialogs.res - @for %i in () do @%append $(OBJS)\dialogs.lbc option stack=%i - wlink @$(OBJS)\dialogs.lbc - -data : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\dialogs_dialogs.obj : .AUTODEPEND .\dialogs.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $< - -$(OBJS)\dialogs_colrdlgg.obj : .AUTODEPEND .\..\..\src\generic\colrdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $< - -$(OBJS)\dialogs_dirdlgg.obj : .AUTODEPEND .\..\..\src\generic\dirdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $< - -$(OBJS)\dialogs_filedlgg.obj : .AUTODEPEND .\..\..\src\generic\filedlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $< - -$(OBJS)\dialogs_fontdlgg.obj : .AUTODEPEND .\..\..\src\generic\fontdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $< - -$(OBJS)\dialogs_dialogs.res : .AUTODEPEND .\dialogs.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = +!ifeq SHARED 0 +!ifeq WXUNIV 0 +____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS = & + $(OBJS)\dialogs_colrdlgg.obj & + $(OBJS)\dialogs_dirdlgg.obj & + $(OBJS)\dialogs_filedlgg.obj & + $(OBJS)\dialogs_fontdlgg.obj +!endif +!endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +DIALOGS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +DIALOGS_OBJECTS = & + $(OBJS)\dialogs_dialogs.obj & + $(____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS) + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\dialogs.exe data + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe + +$(OBJS)\dialogs.exe : $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res + @%create $(OBJS)\dialogs.lbc + @%append $(OBJS)\dialogs.lbc option quiet + @%append $(OBJS)\dialogs.lbc name $^@ + @%append $(OBJS)\dialogs.lbc option caseexact + @%append $(OBJS)\dialogs.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(DIALOGS_OBJECTS)) do @%append $(OBJS)\dialogs.lbc file %i + @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\dialogs.lbc library %i + @%append $(OBJS)\dialogs.lbc option resource=$(OBJS)\dialogs_dialogs.res + @for %i in () do @%append $(OBJS)\dialogs.lbc option stack=%i + wlink @$(OBJS)\dialogs.lbc + +data : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\dialogs_dialogs.obj : .AUTODEPEND .\dialogs.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $< + +$(OBJS)\dialogs_colrdlgg.obj : .AUTODEPEND .\..\..\src\generic\colrdlgg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $< + +$(OBJS)\dialogs_dirdlgg.obj : .AUTODEPEND .\..\..\src\generic\dirdlgg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $< + +$(OBJS)\dialogs_filedlgg.obj : .AUTODEPEND .\..\..\src\generic\filedlgg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $< + +$(OBJS)\dialogs_fontdlgg.obj : .AUTODEPEND .\..\..\src\generic\fontdlgg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $< + +$(OBJS)\dialogs_dialogs.res : .AUTODEPEND .\dialogs.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in index 8848f90069..a86267f437 100644 --- a/samples/dialup/Makefile.in +++ b/samples/dialup/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dialup/dialup.dsp b/samples/dialup/dialup.dsp index d1ab143fc7..b6ddced579 100644 --- a/samples/dialup/dialup.dsp +++ b/samples/dialup/dialup.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\nettest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\nettest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\nettest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\nettest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\nettest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\nettest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\nettest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\nettest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\nettest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\nettest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\nettest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\nettest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\nettest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\nettest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\nettest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\nettest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\nettest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\nettest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\nettest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\nettest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/dialup/dialup_vc7.vcproj b/samples/dialup/dialup_vc7.vcproj index ba962952d2..46ad36f2bf 100644 --- a/samples/dialup/dialup_vc7.vcproj +++ b/samples/dialup/dialup_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\nettest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\nettest.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\nettest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\nettest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\nettest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\nettest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\nettest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\nettest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\nettest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\nettest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\nettest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\nettest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -NETTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\nettest.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -NETTEST_OBJECTS = \ - $(OBJS)\nettest_nettest.obj \ - $(OBJS)\nettest_nettest.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\nettest.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\nettest.exe del $(OBJS)\nettest.exe - -if exist $(OBJS)\nettest.ilk del $(OBJS)\nettest.ilk - -if exist $(OBJS)\nettest.pdb del $(OBJS)\nettest.pdb - -$(OBJS)\nettest.exe: $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\nettest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(NETTEST_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\nettest_nettest.obj: .\nettest.cpp - $(CXX) /c /nologo /TP /Fo$@ $(NETTEST_CXXFLAGS) .\nettest.cpp - -$(OBJS)\nettest_nettest.res: .\nettest.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\nettest.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +NETTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\nettest.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +NETTEST_OBJECTS = \ + $(OBJS)\nettest_nettest.obj +NETTEST_RESOURCES = \ + $(OBJS)\nettest_nettest.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\nettest.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\nettest.exe del $(OBJS)\nettest.exe + -if exist $(OBJS)\nettest.ilk del $(OBJS)\nettest.ilk + -if exist $(OBJS)\nettest.pdb del $(OBJS)\nettest.pdb + +$(OBJS)\nettest.exe: $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\nettest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(NETTEST_OBJECTS) $(NETTEST_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\nettest_nettest.obj: .\nettest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NETTEST_CXXFLAGS) .\nettest.cpp + +$(OBJS)\nettest_nettest.res: .\nettest.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\nettest.rc + diff --git a/samples/dialup/makefile.wat b/samples/dialup/makefile.wat index 106412d49d..d00eb457a1 100644 --- a/samples/dialup/makefile.wat +++ b/samples/dialup/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -NETTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -NETTEST_OBJECTS = & - $(OBJS)\nettest_nettest.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\nettest.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\nettest.exe del $(OBJS)\nettest.exe - -$(OBJS)\nettest.exe : $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest.res - @%create $(OBJS)\nettest.lbc - @%append $(OBJS)\nettest.lbc option quiet - @%append $(OBJS)\nettest.lbc name $^@ - @%append $(OBJS)\nettest.lbc option caseexact - @%append $(OBJS)\nettest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(NETTEST_OBJECTS)) do @%append $(OBJS)\nettest.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\nettest.lbc library %i - @%append $(OBJS)\nettest.lbc option resource=$(OBJS)\nettest_nettest.res - @for %i in () do @%append $(OBJS)\nettest.lbc option stack=%i - wlink @$(OBJS)\nettest.lbc - -$(OBJS)\nettest_nettest.obj : .AUTODEPEND .\nettest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETTEST_CXXFLAGS) $< - -$(OBJS)\nettest_nettest.res : .AUTODEPEND .\nettest.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +NETTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +NETTEST_OBJECTS = & + $(OBJS)\nettest_nettest.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\nettest.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\nettest.exe del $(OBJS)\nettest.exe + +$(OBJS)\nettest.exe : $(NETTEST_OBJECTS) $(OBJS)\nettest_nettest.res + @%create $(OBJS)\nettest.lbc + @%append $(OBJS)\nettest.lbc option quiet + @%append $(OBJS)\nettest.lbc name $^@ + @%append $(OBJS)\nettest.lbc option caseexact + @%append $(OBJS)\nettest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(NETTEST_OBJECTS)) do @%append $(OBJS)\nettest.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\nettest.lbc library %i + @%append $(OBJS)\nettest.lbc option resource=$(OBJS)\nettest_nettest.res + @for %i in () do @%append $(OBJS)\nettest.lbc option stack=%i + wlink @$(OBJS)\nettest.lbc + +$(OBJS)\nettest_nettest.obj : .AUTODEPEND .\nettest.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(NETTEST_CXXFLAGS) $< + +$(OBJS)\nettest_nettest.res : .AUTODEPEND .\nettest.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/display/Makefile.in b/samples/display/Makefile.in index 5c2fe5dc56..1d1eedd4dd 100644 --- a/samples/display/Makefile.in +++ b/samples/display/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/display/display.dsp b/samples/display/display.dsp index b773107947..192a02e60c 100644 --- a/samples/display/display.dsp +++ b/samples/display/display.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\display" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\display.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\display.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\display.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\display.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\display" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\display.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\display.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\display.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\display.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\display" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\display.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\display.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\display.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\display.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\display" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\display.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\display.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\display.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\display.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/display/display_vc7.vcproj b/samples/display/display_vc7.vcproj index 372668c071..cb25313f49 100644 --- a/samples/display/display_vc7.vcproj +++ b/samples/display/display_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\display.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\display.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\display.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\display.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\display.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\display.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\display.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\display.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\display.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\display.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\display.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\display.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -DISPLAY_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\display.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -DISPLAY_OBJECTS = \ - $(OBJS)\display_sample.res \ - $(OBJS)\display_display.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\display.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\display.exe del $(OBJS)\display.exe - -if exist $(OBJS)\display.ilk del $(OBJS)\display.ilk - -if exist $(OBJS)\display.pdb del $(OBJS)\display.pdb - -$(OBJS)\display.exe: $(DISPLAY_OBJECTS) $(OBJS)\display_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\display.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(DISPLAY_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\display_sample.res: .\..\..\samples\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc - -$(OBJS)\display_display.obj: .\display.cpp - $(CXX) /c /nologo /TP /Fo$@ $(DISPLAY_CXXFLAGS) .\display.cpp - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +DISPLAY_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\display.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +DISPLAY_OBJECTS = \ + $(OBJS)\display_display.obj +DISPLAY_RESOURCES = \ + $(OBJS)\display_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\display.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\display.exe del $(OBJS)\display.exe + -if exist $(OBJS)\display.ilk del $(OBJS)\display.ilk + -if exist $(OBJS)\display.pdb del $(OBJS)\display.pdb + +$(OBJS)\display.exe: $(DISPLAY_OBJECTS) $(OBJS)\display_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\display.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(DISPLAY_OBJECTS) $(DISPLAY_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\display_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + +$(OBJS)\display_display.obj: .\display.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DISPLAY_CXXFLAGS) .\display.cpp + diff --git a/samples/display/makefile.wat b/samples/display/makefile.wat index 520a8ce5dd..daeb8b21bb 100644 --- a/samples/display/makefile.wat +++ b/samples/display/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -DISPLAY_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -DISPLAY_OBJECTS = & - $(OBJS)\display_display.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\display.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\display.exe del $(OBJS)\display.exe - -$(OBJS)\display.exe : $(DISPLAY_OBJECTS) $(OBJS)\display_sample.res - @%create $(OBJS)\display.lbc - @%append $(OBJS)\display.lbc option quiet - @%append $(OBJS)\display.lbc name $^@ - @%append $(OBJS)\display.lbc option caseexact - @%append $(OBJS)\display.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(DISPLAY_OBJECTS)) do @%append $(OBJS)\display.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\display.lbc library %i - @%append $(OBJS)\display.lbc option resource=$(OBJS)\display_sample.res - @for %i in () do @%append $(OBJS)\display.lbc option stack=%i - wlink @$(OBJS)\display.lbc - -$(OBJS)\display_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - -$(OBJS)\display_display.obj : .AUTODEPEND .\display.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DISPLAY_CXXFLAGS) $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +DISPLAY_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +DISPLAY_OBJECTS = & + $(OBJS)\display_display.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\display.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\display.exe del $(OBJS)\display.exe + +$(OBJS)\display.exe : $(DISPLAY_OBJECTS) $(OBJS)\display_sample.res + @%create $(OBJS)\display.lbc + @%append $(OBJS)\display.lbc option quiet + @%append $(OBJS)\display.lbc name $^@ + @%append $(OBJS)\display.lbc option caseexact + @%append $(OBJS)\display.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(DISPLAY_OBJECTS)) do @%append $(OBJS)\display.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\display.lbc library %i + @%append $(OBJS)\display.lbc option resource=$(OBJS)\display_sample.res + @for %i in () do @%append $(OBJS)\display.lbc option stack=%i + wlink @$(OBJS)\display.lbc + +$(OBJS)\display_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + +$(OBJS)\display_display.obj : .AUTODEPEND .\display.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(DISPLAY_CXXFLAGS) $< + diff --git a/samples/dnd/Makefile.in b/samples/dnd/Makefile.in index 17daf50d1b..1d15aa2f4a 100644 --- a/samples/dnd/Makefile.in +++ b/samples/dnd/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dnd/dnd.dsp b/samples/dnd/dnd.dsp index 744b5731e7..43d9a2b045 100644 --- a/samples/dnd/dnd.dsp +++ b/samples/dnd/dnd.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\dnd" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dnd.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dnd.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dnd.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dnd.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\dnd" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dnd.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dnd.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dnd.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dnd.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\dnd" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dnd.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dnd.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dnd.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dnd.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\dnd" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\dnd.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\dnd.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\dnd.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\dnd.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/dnd/dnd_vc7.vcproj b/samples/dnd/dnd_vc7.vcproj index 1112bf73d9..a92c0b45ef 100644 --- a/samples/dnd/dnd_vc7.vcproj +++ b/samples/dnd/dnd_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\dnd.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\dnd.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\dnd.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\dnd.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\dnd.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\dnd.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\dnd.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\dnd.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\dnd.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\dnd.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\dnd.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\dnd.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -DND_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\dnd.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -DND_OBJECTS = \ - $(OBJS)\dnd_dnd.obj \ - $(OBJS)\dnd_dnd.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\dnd.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\dnd.exe del $(OBJS)\dnd.exe - -if exist $(OBJS)\dnd.ilk del $(OBJS)\dnd.ilk - -if exist $(OBJS)\dnd.pdb del $(OBJS)\dnd.pdb - -$(OBJS)\dnd.exe: $(DND_OBJECTS) $(OBJS)\dnd_dnd.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\dnd.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(DND_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (wxwin.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\dnd_dnd.obj: .\dnd.cpp - $(CXX) /c /nologo /TP /Fo$@ $(DND_CXXFLAGS) .\dnd.cpp - -$(OBJS)\dnd_dnd.res: .\dnd.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\dnd.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +DND_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\dnd.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +DND_OBJECTS = \ + $(OBJS)\dnd_dnd.obj +DND_RESOURCES = \ + $(OBJS)\dnd_dnd.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\dnd.exe data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\dnd.exe del $(OBJS)\dnd.exe + -if exist $(OBJS)\dnd.ilk del $(OBJS)\dnd.ilk + -if exist $(OBJS)\dnd.pdb del $(OBJS)\dnd.pdb + +$(OBJS)\dnd.exe: $(DND_OBJECTS) $(OBJS)\dnd_dnd.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\dnd.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(DND_OBJECTS) $(DND_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (wxwin.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\dnd_dnd.obj: .\dnd.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DND_CXXFLAGS) .\dnd.cpp + +$(OBJS)\dnd_dnd.res: .\dnd.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\dnd.rc + diff --git a/samples/dnd/makefile.wat b/samples/dnd/makefile.wat index dea15c6ec9..1f37ceabed 100644 --- a/samples/dnd/makefile.wat +++ b/samples/dnd/makefile.wat @@ -1,264 +1,264 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -DND_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -DND_OBJECTS = & - $(OBJS)\dnd_dnd.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\dnd.exe data - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\dnd.exe del $(OBJS)\dnd.exe - -$(OBJS)\dnd.exe : $(DND_OBJECTS) $(OBJS)\dnd_dnd.res - @%create $(OBJS)\dnd.lbc - @%append $(OBJS)\dnd.lbc option quiet - @%append $(OBJS)\dnd.lbc name $^@ - @%append $(OBJS)\dnd.lbc option caseexact - @%append $(OBJS)\dnd.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(DND_OBJECTS)) do @%append $(OBJS)\dnd.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\dnd.lbc library %i - @%append $(OBJS)\dnd.lbc option resource=$(OBJS)\dnd_dnd.res - @for %i in () do @%append $(OBJS)\dnd.lbc option stack=%i - wlink @$(OBJS)\dnd.lbc - -data : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (wxwin.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\dnd_dnd.obj : .AUTODEPEND .\dnd.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DND_CXXFLAGS) $< - -$(OBJS)\dnd_dnd.res : .AUTODEPEND .\dnd.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +DND_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +DND_OBJECTS = & + $(OBJS)\dnd_dnd.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\dnd.exe data + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\dnd.exe del $(OBJS)\dnd.exe + +$(OBJS)\dnd.exe : $(DND_OBJECTS) $(OBJS)\dnd_dnd.res + @%create $(OBJS)\dnd.lbc + @%append $(OBJS)\dnd.lbc option quiet + @%append $(OBJS)\dnd.lbc name $^@ + @%append $(OBJS)\dnd.lbc option caseexact + @%append $(OBJS)\dnd.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(DND_OBJECTS)) do @%append $(OBJS)\dnd.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\dnd.lbc library %i + @%append $(OBJS)\dnd.lbc option resource=$(OBJS)\dnd_dnd.res + @for %i in () do @%append $(OBJS)\dnd.lbc option stack=%i + wlink @$(OBJS)\dnd.lbc + +data : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (wxwin.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\dnd_dnd.obj : .AUTODEPEND .\dnd.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(DND_CXXFLAGS) $< + +$(OBJS)\dnd_dnd.res : .AUTODEPEND .\dnd.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in index f765811450..a05291860c 100644 --- a/samples/docview/Makefile.in +++ b/samples/docview/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/docview/docview.dsp b/samples/docview/docview.dsp index 67624eb95d..802d71f778 100644 --- a/samples/docview/docview.dsp +++ b/samples/docview/docview.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\docview" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\docview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\docview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\docview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\docview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\docview" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\docview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\docview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\docview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\docview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\docview" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\docview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\docview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\docview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\docview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\docview" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\docview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\docview.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\docview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\docview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/docview/docview_vc7.vcproj b/samples/docview/docview_vc7.vcproj index 76e91b9de2..7a1b557391 100644 --- a/samples/docview/docview_vc7.vcproj +++ b/samples/docview/docview_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\docview.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\docview.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\docview.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\docview.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\docview.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\docview.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\docview.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\docview.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\docview.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\docview.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\docview.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\docview.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -DOCVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\docview.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -DOCVIEW_OBJECTS = \ - $(OBJS)\docview_docview.obj \ - $(OBJS)\docview_doc.obj \ - $(OBJS)\docview_view.obj \ - $(OBJS)\docview_docview.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\docview.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe - -if exist $(OBJS)\docview.ilk del $(OBJS)\docview.ilk - -if exist $(OBJS)\docview.pdb del $(OBJS)\docview.pdb - -$(OBJS)\docview.exe: $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\docview.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(DOCVIEW_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\docview_docview.obj: .\docview.cpp - $(CXX) /c /nologo /TP /Fo$@ $(DOCVIEW_CXXFLAGS) .\docview.cpp - -$(OBJS)\docview_doc.obj: .\doc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(DOCVIEW_CXXFLAGS) .\doc.cpp - -$(OBJS)\docview_view.obj: .\view.cpp - $(CXX) /c /nologo /TP /Fo$@ $(DOCVIEW_CXXFLAGS) .\view.cpp - -$(OBJS)\docview_docview.res: .\docview.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\docview.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +DOCVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\docview.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +DOCVIEW_OBJECTS = \ + $(OBJS)\docview_docview.obj \ + $(OBJS)\docview_doc.obj \ + $(OBJS)\docview_view.obj +DOCVIEW_RESOURCES = \ + $(OBJS)\docview_docview.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\docview.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe + -if exist $(OBJS)\docview.ilk del $(OBJS)\docview.ilk + -if exist $(OBJS)\docview.pdb del $(OBJS)\docview.pdb + +$(OBJS)\docview.exe: $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\docview.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(DOCVIEW_OBJECTS) $(DOCVIEW_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\docview_docview.obj: .\docview.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DOCVIEW_CXXFLAGS) .\docview.cpp + +$(OBJS)\docview_doc.obj: .\doc.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DOCVIEW_CXXFLAGS) .\doc.cpp + +$(OBJS)\docview_view.obj: .\view.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DOCVIEW_CXXFLAGS) .\view.cpp + +$(OBJS)\docview_docview.res: .\docview.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\docview.rc + diff --git a/samples/docview/makefile.wat b/samples/docview/makefile.wat index 456a4facbc..00cdae60fd 100644 --- a/samples/docview/makefile.wat +++ b/samples/docview/makefile.wat @@ -1,268 +1,268 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -DOCVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -DOCVIEW_OBJECTS = & - $(OBJS)\docview_docview.obj & - $(OBJS)\docview_doc.obj & - $(OBJS)\docview_view.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\docview.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe - -$(OBJS)\docview.exe : $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview.res - @%create $(OBJS)\docview.lbc - @%append $(OBJS)\docview.lbc option quiet - @%append $(OBJS)\docview.lbc name $^@ - @%append $(OBJS)\docview.lbc option caseexact - @%append $(OBJS)\docview.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(DOCVIEW_OBJECTS)) do @%append $(OBJS)\docview.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\docview.lbc library %i - @%append $(OBJS)\docview.lbc option resource=$(OBJS)\docview_docview.res - @for %i in () do @%append $(OBJS)\docview.lbc option stack=%i - wlink @$(OBJS)\docview.lbc - -$(OBJS)\docview_docview.obj : .AUTODEPEND .\docview.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $< - -$(OBJS)\docview_doc.obj : .AUTODEPEND .\doc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $< - -$(OBJS)\docview_view.obj : .AUTODEPEND .\view.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $< - -$(OBJS)\docview_docview.res : .AUTODEPEND .\docview.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +DOCVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +DOCVIEW_OBJECTS = & + $(OBJS)\docview_docview.obj & + $(OBJS)\docview_doc.obj & + $(OBJS)\docview_view.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\docview.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe + +$(OBJS)\docview.exe : $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview.res + @%create $(OBJS)\docview.lbc + @%append $(OBJS)\docview.lbc option quiet + @%append $(OBJS)\docview.lbc name $^@ + @%append $(OBJS)\docview.lbc option caseexact + @%append $(OBJS)\docview.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(DOCVIEW_OBJECTS)) do @%append $(OBJS)\docview.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\docview.lbc library %i + @%append $(OBJS)\docview.lbc option resource=$(OBJS)\docview_docview.res + @for %i in () do @%append $(OBJS)\docview.lbc option stack=%i + wlink @$(OBJS)\docview.lbc + +$(OBJS)\docview_docview.obj : .AUTODEPEND .\docview.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $< + +$(OBJS)\docview_doc.obj : .AUTODEPEND .\doc.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $< + +$(OBJS)\docview_view.obj : .AUTODEPEND .\view.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(DOCVIEW_CXXFLAGS) $< + +$(OBJS)\docview_docview.res : .AUTODEPEND .\docview.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in index a68f57b3aa..88bb3713a8 100644 --- a/samples/dragimag/Makefile.in +++ b/samples/dragimag/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/dragimag/dragimag.dsp b/samples/dragimag/dragimag.dsp index 2cc1bb916b..a3ed339aba 100644 --- a/samples/dragimag/dragimag.dsp +++ b/samples/dragimag/dragimag.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\dragimag" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dragimag.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dragimag.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dragimag.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\dragimag.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\dragimag" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dragimag.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dragimag.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dragimag.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\dragimag.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\dragimag" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dragimag.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dragimag.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dragimag.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\dragimag.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\dragimag" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\dragimag.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\dragimag.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\dragimag.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\dragimag.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/dragimag/dragimag_vc7.vcproj b/samples/dragimag/dragimag_vc7.vcproj index 0dc3240921..104d906686 100644 --- a/samples/dragimag/dragimag_vc7.vcproj +++ b/samples/dragimag/dragimag_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\dragimag.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\dragimag.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\dragimag.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\dragimag.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\dragimag.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\dragimag.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\dragimag.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\dragimag.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\dragimag.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\dragimag.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\dragimag.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\dragimag.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -DRAGIMAG_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\dragimag.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -DRAGIMAG_OBJECTS = \ - $(OBJS)\dragimag_dragimag.obj \ - $(OBJS)\dragimag_dragimag.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\dragimag.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\dragimag.exe del $(OBJS)\dragimag.exe - -if exist $(OBJS)\dragimag.ilk del $(OBJS)\dragimag.ilk - -if exist $(OBJS)\dragimag.pdb del $(OBJS)\dragimag.pdb - -$(OBJS)\dragimag.exe: $(DRAGIMAG_OBJECTS) $(OBJS)\dragimag_dragimag.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\dragimag.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(DRAGIMAG_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (backgrnd.png shape01.png shape02.png shape03.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\dragimag_dragimag.obj: .\dragimag.cpp - $(CXX) /c /nologo /TP /Fo$@ $(DRAGIMAG_CXXFLAGS) .\dragimag.cpp - -$(OBJS)\dragimag_dragimag.res: .\dragimag.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\dragimag.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +DRAGIMAG_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\dragimag.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +DRAGIMAG_OBJECTS = \ + $(OBJS)\dragimag_dragimag.obj +DRAGIMAG_RESOURCES = \ + $(OBJS)\dragimag_dragimag.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\dragimag.exe data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\dragimag.exe del $(OBJS)\dragimag.exe + -if exist $(OBJS)\dragimag.ilk del $(OBJS)\dragimag.ilk + -if exist $(OBJS)\dragimag.pdb del $(OBJS)\dragimag.pdb + +$(OBJS)\dragimag.exe: $(DRAGIMAG_OBJECTS) $(OBJS)\dragimag_dragimag.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\dragimag.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(DRAGIMAG_OBJECTS) $(DRAGIMAG_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (backgrnd.png shape01.png shape02.png shape03.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\dragimag_dragimag.obj: .\dragimag.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DRAGIMAG_CXXFLAGS) .\dragimag.cpp + +$(OBJS)\dragimag_dragimag.res: .\dragimag.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\dragimag.rc + diff --git a/samples/dragimag/makefile.wat b/samples/dragimag/makefile.wat index a28c891098..7a3f3208ca 100644 --- a/samples/dragimag/makefile.wat +++ b/samples/dragimag/makefile.wat @@ -1,264 +1,264 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -DRAGIMAG_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -DRAGIMAG_OBJECTS = & - $(OBJS)\dragimag_dragimag.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\dragimag.exe data - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\dragimag.exe del $(OBJS)\dragimag.exe - -$(OBJS)\dragimag.exe : $(DRAGIMAG_OBJECTS) $(OBJS)\dragimag_dragimag.res - @%create $(OBJS)\dragimag.lbc - @%append $(OBJS)\dragimag.lbc option quiet - @%append $(OBJS)\dragimag.lbc name $^@ - @%append $(OBJS)\dragimag.lbc option caseexact - @%append $(OBJS)\dragimag.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(DRAGIMAG_OBJECTS)) do @%append $(OBJS)\dragimag.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\dragimag.lbc library %i - @%append $(OBJS)\dragimag.lbc option resource=$(OBJS)\dragimag_dragimag.res - @for %i in () do @%append $(OBJS)\dragimag.lbc option stack=%i - wlink @$(OBJS)\dragimag.lbc - -data : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (backgrnd.png shape01.png shape02.png shape03.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\dragimag_dragimag.obj : .AUTODEPEND .\dragimag.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DRAGIMAG_CXXFLAGS) $< - -$(OBJS)\dragimag_dragimag.res : .AUTODEPEND .\dragimag.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +DRAGIMAG_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +DRAGIMAG_OBJECTS = & + $(OBJS)\dragimag_dragimag.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\dragimag.exe data + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\dragimag.exe del $(OBJS)\dragimag.exe + +$(OBJS)\dragimag.exe : $(DRAGIMAG_OBJECTS) $(OBJS)\dragimag_dragimag.res + @%create $(OBJS)\dragimag.lbc + @%append $(OBJS)\dragimag.lbc option quiet + @%append $(OBJS)\dragimag.lbc name $^@ + @%append $(OBJS)\dragimag.lbc option caseexact + @%append $(OBJS)\dragimag.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(DRAGIMAG_OBJECTS)) do @%append $(OBJS)\dragimag.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\dragimag.lbc library %i + @%append $(OBJS)\dragimag.lbc option resource=$(OBJS)\dragimag_dragimag.res + @for %i in () do @%append $(OBJS)\dragimag.lbc option stack=%i + wlink @$(OBJS)\dragimag.lbc + +data : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (backgrnd.png shape01.png shape02.png shape03.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\dragimag_dragimag.obj : .AUTODEPEND .\dragimag.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(DRAGIMAG_CXXFLAGS) $< + +$(OBJS)\dragimag_dragimag.res : .AUTODEPEND .\dragimag.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/drawing/Makefile.in b/samples/drawing/Makefile.in index b15595575f..5c31909c5b 100644 --- a/samples/drawing/Makefile.in +++ b/samples/drawing/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/drawing/drawing.dsp b/samples/drawing/drawing.dsp index 8adc4e27a3..e75526cbc9 100644 --- a/samples/drawing/drawing.dsp +++ b/samples/drawing/drawing.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\drawing" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\drawing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\drawing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\drawing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\drawing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\drawing" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\drawing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\drawing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\drawing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\drawing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\drawing" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\drawing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\drawing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\drawing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\drawing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\drawing" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\drawing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\drawing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\drawing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\drawing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/drawing/drawing_vc7.vcproj b/samples/drawing/drawing_vc7.vcproj index 0676fd7f75..68bdce7375 100644 --- a/samples/drawing/drawing_vc7.vcproj +++ b/samples/drawing/drawing_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\drawing.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\drawing.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\drawing.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\drawing.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\drawing.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\drawing.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\drawing.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\drawing.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\drawing.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\drawing.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\drawing.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\drawing.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -DRAWING_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\drawing.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -DRAWING_OBJECTS = \ - $(OBJS)\drawing_drawing.obj \ - $(OBJS)\drawing_drawing.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\drawing.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\drawing.exe del $(OBJS)\drawing.exe - -if exist $(OBJS)\drawing.ilk del $(OBJS)\drawing.ilk - -if exist $(OBJS)\drawing.pdb del $(OBJS)\drawing.pdb - -$(OBJS)\drawing.exe: $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\drawing.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(DRAWING_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\drawing_drawing.obj: .\drawing.cpp - $(CXX) /c /nologo /TP /Fo$@ $(DRAWING_CXXFLAGS) .\drawing.cpp - -$(OBJS)\drawing_drawing.res: .\drawing.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\drawing.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +DRAWING_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\drawing.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +DRAWING_OBJECTS = \ + $(OBJS)\drawing_drawing.obj +DRAWING_RESOURCES = \ + $(OBJS)\drawing_drawing.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\drawing.exe data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\drawing.exe del $(OBJS)\drawing.exe + -if exist $(OBJS)\drawing.ilk del $(OBJS)\drawing.ilk + -if exist $(OBJS)\drawing.pdb del $(OBJS)\drawing.pdb + +$(OBJS)\drawing.exe: $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\drawing.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(DRAWING_OBJECTS) $(DRAWING_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\drawing_drawing.obj: .\drawing.cpp + $(CXX) /c /nologo /TP /Fo$@ $(DRAWING_CXXFLAGS) .\drawing.cpp + +$(OBJS)\drawing_drawing.res: .\drawing.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\drawing.rc + diff --git a/samples/drawing/makefile.wat b/samples/drawing/makefile.wat index 9fd109244d..0de230cbcf 100644 --- a/samples/drawing/makefile.wat +++ b/samples/drawing/makefile.wat @@ -1,264 +1,264 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -DRAWING_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -DRAWING_OBJECTS = & - $(OBJS)\drawing_drawing.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\drawing.exe data - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\drawing.exe del $(OBJS)\drawing.exe - -$(OBJS)\drawing.exe : $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing.res - @%create $(OBJS)\drawing.lbc - @%append $(OBJS)\drawing.lbc option quiet - @%append $(OBJS)\drawing.lbc name $^@ - @%append $(OBJS)\drawing.lbc option caseexact - @%append $(OBJS)\drawing.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(DRAWING_OBJECTS)) do @%append $(OBJS)\drawing.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\drawing.lbc library %i - @%append $(OBJS)\drawing.lbc option resource=$(OBJS)\drawing_drawing.res - @for %i in () do @%append $(OBJS)\drawing.lbc option stack=%i - wlink @$(OBJS)\drawing.lbc - -data : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\drawing_drawing.obj : .AUTODEPEND .\drawing.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(DRAWING_CXXFLAGS) $< - -$(OBJS)\drawing_drawing.res : .AUTODEPEND .\drawing.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +DRAWING_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +DRAWING_OBJECTS = & + $(OBJS)\drawing_drawing.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\drawing.exe data + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\drawing.exe del $(OBJS)\drawing.exe + +$(OBJS)\drawing.exe : $(DRAWING_OBJECTS) $(OBJS)\drawing_drawing.res + @%create $(OBJS)\drawing.lbc + @%append $(OBJS)\drawing.lbc option quiet + @%append $(OBJS)\drawing.lbc name $^@ + @%append $(OBJS)\drawing.lbc option caseexact + @%append $(OBJS)\drawing.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(DRAWING_OBJECTS)) do @%append $(OBJS)\drawing.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\drawing.lbc library %i + @%append $(OBJS)\drawing.lbc option resource=$(OBJS)\drawing_drawing.res + @for %i in () do @%append $(OBJS)\drawing.lbc option stack=%i + wlink @$(OBJS)\drawing.lbc + +data : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (pat4.bmp pat35.bmp pat36.bmp image.bmp mask.bmp) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\drawing_drawing.obj : .AUTODEPEND .\drawing.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(DRAWING_CXXFLAGS) $< + +$(OBJS)\drawing_drawing.res : .AUTODEPEND .\drawing.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/erase/Makefile.in b/samples/erase/Makefile.in index 9e4d63721a..c67d4bfb36 100644 --- a/samples/erase/Makefile.in +++ b/samples/erase/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/erase/erase.dsp b/samples/erase/erase.dsp index 9a52499279..cdc7f0f7af 100644 --- a/samples/erase/erase.dsp +++ b/samples/erase/erase.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\erase" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\erase.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\erase.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\erase.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\erase.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\erase" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\erase.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\erase.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\erase.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\erase.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\erase" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\erase.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\erase.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\erase.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\erase.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\erase" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\erase.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\erase.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\erase.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\erase.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/erase/erase_vc7.vcproj b/samples/erase/erase_vc7.vcproj index 97eb2a4bd0..6210ba9884 100644 --- a/samples/erase/erase_vc7.vcproj +++ b/samples/erase/erase_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\erase.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\erase.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\erase.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\erase.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\erase.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\erase.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\erase.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\erase.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\erase.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\erase.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\erase.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\erase.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -ERASE_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\erase.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -ERASE_OBJECTS = \ - $(OBJS)\erase_erase.obj \ - $(OBJS)\erase_erase.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\erase.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\erase.exe del $(OBJS)\erase.exe - -if exist $(OBJS)\erase.ilk del $(OBJS)\erase.ilk - -if exist $(OBJS)\erase.pdb del $(OBJS)\erase.pdb - -$(OBJS)\erase.exe: $(ERASE_OBJECTS) $(OBJS)\erase_erase.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\erase.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(ERASE_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\erase_erase.obj: .\erase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ERASE_CXXFLAGS) .\erase.cpp - -$(OBJS)\erase_erase.res: .\erase.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\erase.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +ERASE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\erase.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +ERASE_OBJECTS = \ + $(OBJS)\erase_erase.obj +ERASE_RESOURCES = \ + $(OBJS)\erase_erase.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\erase.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\erase.exe del $(OBJS)\erase.exe + -if exist $(OBJS)\erase.ilk del $(OBJS)\erase.ilk + -if exist $(OBJS)\erase.pdb del $(OBJS)\erase.pdb + +$(OBJS)\erase.exe: $(ERASE_OBJECTS) $(OBJS)\erase_erase.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\erase.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(ERASE_OBJECTS) $(ERASE_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\erase_erase.obj: .\erase.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ERASE_CXXFLAGS) .\erase.cpp + +$(OBJS)\erase_erase.res: .\erase.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\erase.rc + diff --git a/samples/erase/makefile.wat b/samples/erase/makefile.wat index f816499f9d..170ed5dea3 100644 --- a/samples/erase/makefile.wat +++ b/samples/erase/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -ERASE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -ERASE_OBJECTS = & - $(OBJS)\erase_erase.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\erase.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\erase.exe del $(OBJS)\erase.exe - -$(OBJS)\erase.exe : $(ERASE_OBJECTS) $(OBJS)\erase_erase.res - @%create $(OBJS)\erase.lbc - @%append $(OBJS)\erase.lbc option quiet - @%append $(OBJS)\erase.lbc name $^@ - @%append $(OBJS)\erase.lbc option caseexact - @%append $(OBJS)\erase.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(ERASE_OBJECTS)) do @%append $(OBJS)\erase.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\erase.lbc library %i - @%append $(OBJS)\erase.lbc option resource=$(OBJS)\erase_erase.res - @for %i in () do @%append $(OBJS)\erase.lbc option stack=%i - wlink @$(OBJS)\erase.lbc - -$(OBJS)\erase_erase.obj : .AUTODEPEND .\erase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ERASE_CXXFLAGS) $< - -$(OBJS)\erase_erase.res : .AUTODEPEND .\erase.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +ERASE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +ERASE_OBJECTS = & + $(OBJS)\erase_erase.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\erase.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\erase.exe del $(OBJS)\erase.exe + +$(OBJS)\erase.exe : $(ERASE_OBJECTS) $(OBJS)\erase_erase.res + @%create $(OBJS)\erase.lbc + @%append $(OBJS)\erase.lbc option quiet + @%append $(OBJS)\erase.lbc name $^@ + @%append $(OBJS)\erase.lbc option caseexact + @%append $(OBJS)\erase.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(ERASE_OBJECTS)) do @%append $(OBJS)\erase.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\erase.lbc library %i + @%append $(OBJS)\erase.lbc option resource=$(OBJS)\erase_erase.res + @for %i in () do @%append $(OBJS)\erase.lbc option stack=%i + wlink @$(OBJS)\erase.lbc + +$(OBJS)\erase_erase.obj : .AUTODEPEND .\erase.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ERASE_CXXFLAGS) $< + +$(OBJS)\erase_erase.res : .AUTODEPEND .\erase.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/event/Makefile.in b/samples/event/Makefile.in index 54418b0adc..4ada72a695 100644 --- a/samples/event/Makefile.in +++ b/samples/event/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/event/event.dsp b/samples/event/event.dsp index 3a6babfd62..1a984aefe6 100644 --- a/samples/event/event.dsp +++ b/samples/event/event.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\event" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\event.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\event.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\event.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\event.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\event" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\event.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\event.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\event.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\event.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\event" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\event.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\event.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\event.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\event.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\event" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\event.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\event.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\event.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\event.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/event/event_vc7.vcproj b/samples/event/event_vc7.vcproj index 631b7ccde9..b3012625ec 100644 --- a/samples/event/event_vc7.vcproj +++ b/samples/event/event_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\event.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\event.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\event.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\event.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\event.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\event.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\event.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\event.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\event.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\event.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\event.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\event.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -EVENT_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\event.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -EVENT_OBJECTS = \ - $(OBJS)\event_event.obj \ - $(OBJS)\event_event.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\event.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\event.exe del $(OBJS)\event.exe - -if exist $(OBJS)\event.ilk del $(OBJS)\event.ilk - -if exist $(OBJS)\event.pdb del $(OBJS)\event.pdb - -$(OBJS)\event.exe: $(EVENT_OBJECTS) $(OBJS)\event_event.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\event.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(EVENT_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\event_event.obj: .\event.cpp - $(CXX) /c /nologo /TP /Fo$@ $(EVENT_CXXFLAGS) .\event.cpp - -$(OBJS)\event_event.res: .\event.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\event.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +EVENT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\event.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +EVENT_OBJECTS = \ + $(OBJS)\event_event.obj +EVENT_RESOURCES = \ + $(OBJS)\event_event.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\event.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\event.exe del $(OBJS)\event.exe + -if exist $(OBJS)\event.ilk del $(OBJS)\event.ilk + -if exist $(OBJS)\event.pdb del $(OBJS)\event.pdb + +$(OBJS)\event.exe: $(EVENT_OBJECTS) $(OBJS)\event_event.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\event.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(EVENT_OBJECTS) $(EVENT_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\event_event.obj: .\event.cpp + $(CXX) /c /nologo /TP /Fo$@ $(EVENT_CXXFLAGS) .\event.cpp + +$(OBJS)\event_event.res: .\event.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\event.rc + diff --git a/samples/event/makefile.wat b/samples/event/makefile.wat index b4f92ecab6..ccd509c01f 100644 --- a/samples/event/makefile.wat +++ b/samples/event/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -EVENT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -EVENT_OBJECTS = & - $(OBJS)\event_event.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\event.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\event.exe del $(OBJS)\event.exe - -$(OBJS)\event.exe : $(EVENT_OBJECTS) $(OBJS)\event_event.res - @%create $(OBJS)\event.lbc - @%append $(OBJS)\event.lbc option quiet - @%append $(OBJS)\event.lbc name $^@ - @%append $(OBJS)\event.lbc option caseexact - @%append $(OBJS)\event.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(EVENT_OBJECTS)) do @%append $(OBJS)\event.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\event.lbc library %i - @%append $(OBJS)\event.lbc option resource=$(OBJS)\event_event.res - @for %i in () do @%append $(OBJS)\event.lbc option stack=%i - wlink @$(OBJS)\event.lbc - -$(OBJS)\event_event.obj : .AUTODEPEND .\event.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(EVENT_CXXFLAGS) $< - -$(OBJS)\event_event.res : .AUTODEPEND .\event.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +EVENT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +EVENT_OBJECTS = & + $(OBJS)\event_event.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\event.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\event.exe del $(OBJS)\event.exe + +$(OBJS)\event.exe : $(EVENT_OBJECTS) $(OBJS)\event_event.res + @%create $(OBJS)\event.lbc + @%append $(OBJS)\event.lbc option quiet + @%append $(OBJS)\event.lbc name $^@ + @%append $(OBJS)\event.lbc option caseexact + @%append $(OBJS)\event.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(EVENT_OBJECTS)) do @%append $(OBJS)\event.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\event.lbc library %i + @%append $(OBJS)\event.lbc option resource=$(OBJS)\event_event.res + @for %i in () do @%append $(OBJS)\event.lbc option stack=%i + wlink @$(OBJS)\event.lbc + +$(OBJS)\event_event.obj : .AUTODEPEND .\event.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(EVENT_CXXFLAGS) $< + +$(OBJS)\event_event.res : .AUTODEPEND .\event.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/except/Makefile.in b/samples/except/Makefile.in index fcafe79eaa..1ea0ad6bee 100644 --- a/samples/except/Makefile.in +++ b/samples/except/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/except/except.dsp b/samples/except/except.dsp index d2525783c3..d1c0c8cb5c 100644 --- a/samples/except/except.dsp +++ b/samples/except/except.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\except" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\except.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\except.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\except.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\except.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\except" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\except.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\except.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\except.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\except.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\except" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\except.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\except.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\except.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\except.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\except" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\except.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\except.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\except.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\except.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/except/except_vc7.vcproj b/samples/except/except_vc7.vcproj index f077d0bcc9..0878305df5 100644 --- a/samples/except/except_vc7.vcproj +++ b/samples/except/except_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\except.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\except.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\except.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\except.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\except.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\except.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\except.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\except.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\except.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\except.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\except.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\except.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -EXCEPT_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\except.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -EXCEPT_OBJECTS = \ - $(OBJS)\except_sample.res \ - $(OBJS)\except_except.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\except.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\except.exe del $(OBJS)\except.exe - -if exist $(OBJS)\except.ilk del $(OBJS)\except.ilk - -if exist $(OBJS)\except.pdb del $(OBJS)\except.pdb - -$(OBJS)\except.exe: $(EXCEPT_OBJECTS) $(OBJS)\except_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\except.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(EXCEPT_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\except_sample.res: .\..\..\samples\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc - -$(OBJS)\except_except.obj: .\except.cpp - $(CXX) /c /nologo /TP /Fo$@ $(EXCEPT_CXXFLAGS) .\except.cpp - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +EXCEPT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\except.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +EXCEPT_OBJECTS = \ + $(OBJS)\except_except.obj +EXCEPT_RESOURCES = \ + $(OBJS)\except_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\except.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\except.exe del $(OBJS)\except.exe + -if exist $(OBJS)\except.ilk del $(OBJS)\except.ilk + -if exist $(OBJS)\except.pdb del $(OBJS)\except.pdb + +$(OBJS)\except.exe: $(EXCEPT_OBJECTS) $(OBJS)\except_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\except.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(EXCEPT_OBJECTS) $(EXCEPT_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\except_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + +$(OBJS)\except_except.obj: .\except.cpp + $(CXX) /c /nologo /TP /Fo$@ $(EXCEPT_CXXFLAGS) .\except.cpp + diff --git a/samples/except/makefile.wat b/samples/except/makefile.wat index 344d2865be..0e26ec2a19 100644 --- a/samples/except/makefile.wat +++ b/samples/except/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -EXCEPT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -EXCEPT_OBJECTS = & - $(OBJS)\except_except.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\except.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\except.exe del $(OBJS)\except.exe - -$(OBJS)\except.exe : $(EXCEPT_OBJECTS) $(OBJS)\except_sample.res - @%create $(OBJS)\except.lbc - @%append $(OBJS)\except.lbc option quiet - @%append $(OBJS)\except.lbc name $^@ - @%append $(OBJS)\except.lbc option caseexact - @%append $(OBJS)\except.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(EXCEPT_OBJECTS)) do @%append $(OBJS)\except.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\except.lbc library %i - @%append $(OBJS)\except.lbc option resource=$(OBJS)\except_sample.res - @for %i in () do @%append $(OBJS)\except.lbc option stack=%i - wlink @$(OBJS)\except.lbc - -$(OBJS)\except_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - -$(OBJS)\except_except.obj : .AUTODEPEND .\except.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(EXCEPT_CXXFLAGS) $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +EXCEPT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +EXCEPT_OBJECTS = & + $(OBJS)\except_except.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\except.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\except.exe del $(OBJS)\except.exe + +$(OBJS)\except.exe : $(EXCEPT_OBJECTS) $(OBJS)\except_sample.res + @%create $(OBJS)\except.lbc + @%append $(OBJS)\except.lbc option quiet + @%append $(OBJS)\except.lbc name $^@ + @%append $(OBJS)\except.lbc option caseexact + @%append $(OBJS)\except.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(EXCEPT_OBJECTS)) do @%append $(OBJS)\except.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\except.lbc library %i + @%append $(OBJS)\except.lbc option resource=$(OBJS)\except_sample.res + @for %i in () do @%append $(OBJS)\except.lbc option stack=%i + wlink @$(OBJS)\except.lbc + +$(OBJS)\except_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + +$(OBJS)\except_except.obj : .AUTODEPEND .\except.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(EXCEPT_CXXFLAGS) $< + diff --git a/samples/exec/Makefile.in b/samples/exec/Makefile.in index dc19379048..c97f1433d6 100644 --- a/samples/exec/Makefile.in +++ b/samples/exec/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/exec/exec.dsp b/samples/exec/exec.dsp index 5f084e303b..5323ba1625 100644 --- a/samples/exec/exec.dsp +++ b/samples/exec/exec.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\exec" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\exec.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\exec.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\exec.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\exec.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\exec" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\exec.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\exec.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\exec.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\exec.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\exec" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\exec.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\exec.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\exec.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\exec.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\exec" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\exec.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\exec.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\exec.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\exec.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/exec/exec_vc7.vcproj b/samples/exec/exec_vc7.vcproj index 7f783ea19e..b4b1c5a19d 100644 --- a/samples/exec/exec_vc7.vcproj +++ b/samples/exec/exec_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\exec.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\exec.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\exec.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\exec.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\exec.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\exec.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\exec.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\exec.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\exec.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\exec.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\exec.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\exec.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -EXEC_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\exec.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -EXEC_OBJECTS = \ - $(OBJS)\exec_sample.res \ - $(OBJS)\exec_exec.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\exec.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\exec.exe del $(OBJS)\exec.exe - -if exist $(OBJS)\exec.ilk del $(OBJS)\exec.ilk - -if exist $(OBJS)\exec.pdb del $(OBJS)\exec.pdb - -$(OBJS)\exec.exe: $(EXEC_OBJECTS) $(OBJS)\exec_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\exec.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(EXEC_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\exec_sample.res: .\..\..\samples\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc - -$(OBJS)\exec_exec.obj: .\exec.cpp - $(CXX) /c /nologo /TP /Fo$@ $(EXEC_CXXFLAGS) .\exec.cpp - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +EXEC_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\exec.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +EXEC_OBJECTS = \ + $(OBJS)\exec_exec.obj +EXEC_RESOURCES = \ + $(OBJS)\exec_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\exec.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\exec.exe del $(OBJS)\exec.exe + -if exist $(OBJS)\exec.ilk del $(OBJS)\exec.ilk + -if exist $(OBJS)\exec.pdb del $(OBJS)\exec.pdb + +$(OBJS)\exec.exe: $(EXEC_OBJECTS) $(OBJS)\exec_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\exec.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(EXEC_OBJECTS) $(EXEC_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\exec_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + +$(OBJS)\exec_exec.obj: .\exec.cpp + $(CXX) /c /nologo /TP /Fo$@ $(EXEC_CXXFLAGS) .\exec.cpp + diff --git a/samples/exec/makefile.wat b/samples/exec/makefile.wat index d5c0597fac..cb5554a4dc 100644 --- a/samples/exec/makefile.wat +++ b/samples/exec/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -EXEC_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -EXEC_OBJECTS = & - $(OBJS)\exec_exec.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\exec.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\exec.exe del $(OBJS)\exec.exe - -$(OBJS)\exec.exe : $(EXEC_OBJECTS) $(OBJS)\exec_sample.res - @%create $(OBJS)\exec.lbc - @%append $(OBJS)\exec.lbc option quiet - @%append $(OBJS)\exec.lbc name $^@ - @%append $(OBJS)\exec.lbc option caseexact - @%append $(OBJS)\exec.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(EXEC_OBJECTS)) do @%append $(OBJS)\exec.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\exec.lbc library %i - @%append $(OBJS)\exec.lbc option resource=$(OBJS)\exec_sample.res - @for %i in () do @%append $(OBJS)\exec.lbc option stack=%i - wlink @$(OBJS)\exec.lbc - -$(OBJS)\exec_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - -$(OBJS)\exec_exec.obj : .AUTODEPEND .\exec.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(EXEC_CXXFLAGS) $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +EXEC_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +EXEC_OBJECTS = & + $(OBJS)\exec_exec.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\exec.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\exec.exe del $(OBJS)\exec.exe + +$(OBJS)\exec.exe : $(EXEC_OBJECTS) $(OBJS)\exec_sample.res + @%create $(OBJS)\exec.lbc + @%append $(OBJS)\exec.lbc option quiet + @%append $(OBJS)\exec.lbc name $^@ + @%append $(OBJS)\exec.lbc option caseexact + @%append $(OBJS)\exec.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(EXEC_OBJECTS)) do @%append $(OBJS)\exec.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\exec.lbc library %i + @%append $(OBJS)\exec.lbc option resource=$(OBJS)\exec_sample.res + @for %i in () do @%append $(OBJS)\exec.lbc option stack=%i + wlink @$(OBJS)\exec.lbc + +$(OBJS)\exec_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + +$(OBJS)\exec_exec.obj : .AUTODEPEND .\exec.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(EXEC_CXXFLAGS) $< + diff --git a/samples/flash/flash.dsp b/samples/flash/flash.dsp index 2e69c98931..d57c21cda0 100644 --- a/samples/flash/flash.dsp +++ b/samples/flash/flash.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\flash" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\flash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\flash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\flash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\flash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\flash" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\flash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\flash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\flash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\flash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\flash" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\flash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\flash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\flash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\flash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\flash" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\flash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\flash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\flash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\flash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/flash/flash_vc7.vcproj b/samples/flash/flash_vc7.vcproj index 7e0054d9c6..ae40e1a68d 100644 --- a/samples/flash/flash_vc7.vcproj +++ b/samples/flash/flash_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\flash.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\flash.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\flash.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\flash.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\flash.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\flash.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\flash.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\flash.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\flash.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\flash.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\flash.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\flash.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -FLASH_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\flash.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -FLASH_OBJECTS = \ - $(OBJS)\flash_sample.res \ - $(OBJS)\flash_flash.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\flash.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\flash.exe del $(OBJS)\flash.exe - -if exist $(OBJS)\flash.ilk del $(OBJS)\flash.ilk - -if exist $(OBJS)\flash.pdb del $(OBJS)\flash.pdb - -$(OBJS)\flash.exe: $(FLASH_OBJECTS) $(OBJS)\flash_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\flash.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(FLASH_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\flash_sample.res: .\..\..\samples\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc - -$(OBJS)\flash_flash.obj: .\flash.cpp - $(CXX) /c /nologo /TP /Fo$@ $(FLASH_CXXFLAGS) .\flash.cpp - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +FLASH_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\flash.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +FLASH_OBJECTS = \ + $(OBJS)\flash_flash.obj +FLASH_RESOURCES = \ + $(OBJS)\flash_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\flash.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\flash.exe del $(OBJS)\flash.exe + -if exist $(OBJS)\flash.ilk del $(OBJS)\flash.ilk + -if exist $(OBJS)\flash.pdb del $(OBJS)\flash.pdb + +$(OBJS)\flash.exe: $(FLASH_OBJECTS) $(OBJS)\flash_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\flash.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(FLASH_OBJECTS) $(FLASH_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\flash_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + +$(OBJS)\flash_flash.obj: .\flash.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FLASH_CXXFLAGS) .\flash.cpp + diff --git a/samples/font/Makefile.in b/samples/font/Makefile.in index d42f2de05e..e26246d6b2 100644 --- a/samples/font/Makefile.in +++ b/samples/font/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/font/font.dsp b/samples/font/font.dsp index ec59356851..f03f3975ec 100644 --- a/samples/font/font.dsp +++ b/samples/font/font.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\font" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\font.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\font.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\font.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\font.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\font" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\font.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\font.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\font.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\font.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\font" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\font.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\font.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\font.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\font.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\font" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\font.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\font.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\font.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\font.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/font/font_vc7.vcproj b/samples/font/font_vc7.vcproj index fa92d9b712..176d98bd44 100644 --- a/samples/font/font_vc7.vcproj +++ b/samples/font/font_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\font.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\font.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\font.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\font.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\font.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\font.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\font.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\font.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\font.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\font.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\font.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\font.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -FONT_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\font.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -FONT_OBJECTS = \ - $(OBJS)\font_font.obj \ - $(OBJS)\font_font.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\font.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\font.exe del $(OBJS)\font.exe - -if exist $(OBJS)\font.ilk del $(OBJS)\font.ilk - -if exist $(OBJS)\font.pdb del $(OBJS)\font.pdb - -$(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_font.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\font.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(FONT_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\font_font.obj: .\font.cpp - $(CXX) /c /nologo /TP /Fo$@ $(FONT_CXXFLAGS) .\font.cpp - -$(OBJS)\font_font.res: .\font.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\font.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +FONT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\font.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +FONT_OBJECTS = \ + $(OBJS)\font_font.obj +FONT_RESOURCES = \ + $(OBJS)\font_font.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\font.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\font.exe del $(OBJS)\font.exe + -if exist $(OBJS)\font.ilk del $(OBJS)\font.ilk + -if exist $(OBJS)\font.pdb del $(OBJS)\font.pdb + +$(OBJS)\font.exe: $(FONT_OBJECTS) $(OBJS)\font_font.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\font.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(FONT_OBJECTS) $(FONT_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\font_font.obj: .\font.cpp + $(CXX) /c /nologo /TP /Fo$@ $(FONT_CXXFLAGS) .\font.cpp + +$(OBJS)\font_font.res: .\font.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\font.rc + diff --git a/samples/font/makefile.wat b/samples/font/makefile.wat index 613ca97ea9..89ffec0405 100644 --- a/samples/font/makefile.wat +++ b/samples/font/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -FONT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -FONT_OBJECTS = & - $(OBJS)\font_font.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\font.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\font.exe del $(OBJS)\font.exe - -$(OBJS)\font.exe : $(FONT_OBJECTS) $(OBJS)\font_font.res - @%create $(OBJS)\font.lbc - @%append $(OBJS)\font.lbc option quiet - @%append $(OBJS)\font.lbc name $^@ - @%append $(OBJS)\font.lbc option caseexact - @%append $(OBJS)\font.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(FONT_OBJECTS)) do @%append $(OBJS)\font.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\font.lbc library %i - @%append $(OBJS)\font.lbc option resource=$(OBJS)\font_font.res - @for %i in () do @%append $(OBJS)\font.lbc option stack=%i - wlink @$(OBJS)\font.lbc - -$(OBJS)\font_font.obj : .AUTODEPEND .\font.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(FONT_CXXFLAGS) $< - -$(OBJS)\font_font.res : .AUTODEPEND .\font.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +FONT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +FONT_OBJECTS = & + $(OBJS)\font_font.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\font.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\font.exe del $(OBJS)\font.exe + +$(OBJS)\font.exe : $(FONT_OBJECTS) $(OBJS)\font_font.res + @%create $(OBJS)\font.lbc + @%append $(OBJS)\font.lbc option quiet + @%append $(OBJS)\font.lbc name $^@ + @%append $(OBJS)\font.lbc option caseexact + @%append $(OBJS)\font.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(FONT_OBJECTS)) do @%append $(OBJS)\font.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\font.lbc library %i + @%append $(OBJS)\font.lbc option resource=$(OBJS)\font_font.res + @for %i in () do @%append $(OBJS)\font.lbc option stack=%i + wlink @$(OBJS)\font.lbc + +$(OBJS)\font_font.obj : .AUTODEPEND .\font.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(FONT_CXXFLAGS) $< + +$(OBJS)\font_font.res : .AUTODEPEND .\font.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/fswatcher/Makefile.in b/samples/fswatcher/Makefile.in index f3c773d17f..36d06948f3 100644 --- a/samples/fswatcher/Makefile.in +++ b/samples/fswatcher/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -38,7 +38,7 @@ wx_top_builddir = @wx_top_builddir@ ### Variables: ### -DESTDIR = +DESTDIR = WX_RELEASE = 2.9 WX_VERSION = $(WX_RELEASE).1 LIBDIRNAME = $(wx_top_builddir)/lib @@ -64,7 +64,7 @@ FSWATCHER_OBJECTS = \ @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS) @COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI) @COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) -@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = +@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_0@__fswatcher___mac_setfilecmd = @true @COND_PLATFORM_MAC_1@__fswatcher___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL fswatcher$(EXEEXT) @@ -131,13 +131,13 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ all: fswatcher$(EXEEXT) $(__fswatcher_bundle___depname) -install: +install: -uninstall: +uninstall: install-strip: install -clean: +clean: rm -rf ./.deps ./.pch rm -f ./*.o rm -f fswatcher$(EXEEXT) @@ -148,7 +148,7 @@ distclean: clean fswatcher$(EXEEXT): $(FSWATCHER_OBJECTS) $(__fswatcher___win32rc) $(CXX) -o $@ $(FSWATCHER_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) - + $(__fswatcher___mac_setfilecmd) $(__fswatcher___os2_emxbindcmd) @@ -156,20 +156,20 @@ fswatcher$(EXEEXT): $(FSWATCHER_OBJECTS) $(__fswatcher___win32rc) @COND_PLATFORM_MACOSX_1@ mkdir -p fswatcher.app/Contents @COND_PLATFORM_MACOSX_1@ mkdir -p fswatcher.app/Contents/MacOS @COND_PLATFORM_MACOSX_1@ mkdir -p fswatcher.app/Contents/Resources -@COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ +@COND_PLATFORM_MACOSX_1@ +@COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ @COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/fswatcher/" \ @COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \ @COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >fswatcher.app/Contents/Info.plist -@COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ +@COND_PLATFORM_MACOSX_1@ +@COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >fswatcher.app/Contents/PkgInfo -@COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ +@COND_PLATFORM_MACOSX_1@ +@COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ ln -f fswatcher$(EXEEXT) fswatcher.app/Contents/MacOS/fswatcher -@COND_PLATFORM_MACOSX_1@ -@COND_PLATFORM_MACOSX_1@ +@COND_PLATFORM_MACOSX_1@ +@COND_PLATFORM_MACOSX_1@ @COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns fswatcher.app/Contents/Resources/wxmac.icns @COND_PLATFORM_MACOSX_1@fswatcher_bundle: $(____fswatcher_BUNDLE_TGT_REF_DEP) diff --git a/samples/fswatcher/fswatcher.dsp b/samples/fswatcher/fswatcher.dsp index 00c93a2ab9..d3deddea88 100644 --- a/samples/fswatcher/fswatcher.dsp +++ b/samples/fswatcher/fswatcher.dsp @@ -1,264 +1,264 @@ -# Microsoft Developer Studio Project File - Name="fswatcher" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=fswatcher - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "fswatcher.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "fswatcher.mak" CFG="fswatcher - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "fswatcher - Win32 DLL Universal Release" (based on "Win32 (x86) Application") -!MESSAGE "fswatcher - Win32 DLL Universal Debug" (based on "Win32 (x86) Application") -!MESSAGE "fswatcher - Win32 DLL Release" (based on "Win32 (x86) Application") -!MESSAGE "fswatcher - Win32 DLL Debug" (based on "Win32 (x86) Application") -!MESSAGE "fswatcher - Win32 Universal Release" (based on "Win32 (x86) Application") -!MESSAGE "fswatcher - Win32 Universal Debug" (based on "Win32 (x86) Application") -!MESSAGE "fswatcher - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "fswatcher - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "fswatcher - Win32 DLL Universal Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc_mswunivudll" -# PROP BASE Intermediate_Dir "vc_mswunivudll\fswatcher" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswunivudll" -# PROP Intermediate_Dir "vc_mswunivudll\fswatcher" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\fswatcher.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\fswatcher.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivudll\fswatcher.exe" /debug /pdb:"vc_mswunivudll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows -# ADD LINK32 wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivudll\fswatcher.exe" /debug /pdb:"vc_mswunivudll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows - -!ELSEIF "$(CFG)" == "fswatcher - Win32 DLL Universal Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc_mswunivuddll" -# PROP BASE Intermediate_Dir "vc_mswunivuddll\fswatcher" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswunivuddll" -# PROP Intermediate_Dir "vc_mswunivuddll\fswatcher" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivuddll\fswatcher.exe" /debug /pdb:"vc_mswunivuddll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows -# ADD LINK32 wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivuddll\fswatcher.exe" /debug /pdb:"vc_mswunivuddll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows - -!ELSEIF "$(CFG)" == "fswatcher - Win32 DLL Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc_mswudll" -# PROP BASE Intermediate_Dir "vc_mswudll\fswatcher" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswudll" -# PROP Intermediate_Dir "vc_mswudll\fswatcher" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\fswatcher.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\fswatcher.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswudll\fswatcher.exe" /debug /pdb:"vc_mswudll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows -# ADD LINK32 wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswudll\fswatcher.exe" /debug /pdb:"vc_mswudll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows - -!ELSEIF "$(CFG)" == "fswatcher - Win32 DLL Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc_mswuddll" -# PROP BASE Intermediate_Dir "vc_mswuddll\fswatcher" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswuddll" -# PROP Intermediate_Dir "vc_mswuddll\fswatcher" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswuddll\fswatcher.exe" /debug /pdb:"vc_mswuddll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows -# ADD LINK32 wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswuddll\fswatcher.exe" /debug /pdb:"vc_mswuddll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows - -!ELSEIF "$(CFG)" == "fswatcher - Win32 Universal Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc_mswunivu" -# PROP BASE Intermediate_Dir "vc_mswunivu\fswatcher" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswunivu" -# PROP Intermediate_Dir "vc_mswunivu\fswatcher" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\fswatcher.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\fswatcher.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivu\fswatcher.exe" /debug /pdb:"vc_mswunivu\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows -# ADD LINK32 wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivu\fswatcher.exe" /debug /pdb:"vc_mswunivu\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows - -!ELSEIF "$(CFG)" == "fswatcher - Win32 Universal Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc_mswunivud" -# PROP BASE Intermediate_Dir "vc_mswunivud\fswatcher" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswunivud" -# PROP Intermediate_Dir "vc_mswunivud\fswatcher" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivud\fswatcher.exe" /debug /pdb:"vc_mswunivud\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows -# ADD LINK32 wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivud\fswatcher.exe" /debug /pdb:"vc_mswunivud\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows - -!ELSEIF "$(CFG)" == "fswatcher - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc_mswu" -# PROP BASE Intermediate_Dir "vc_mswu\fswatcher" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswu" -# PROP Intermediate_Dir "vc_mswu\fswatcher" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\fswatcher.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\fswatcher.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswu\fswatcher.exe" /debug /pdb:"vc_mswu\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows -# ADD LINK32 wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswu\fswatcher.exe" /debug /pdb:"vc_mswu\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows - -!ELSEIF "$(CFG)" == "fswatcher - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "vc_mswud" -# PROP BASE Intermediate_Dir "vc_mswud\fswatcher" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "vc_mswud" -# PROP Intermediate_Dir "vc_mswud\fswatcher" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswud\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswud\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswud\fswatcher.exe" /debug /pdb:"vc_mswud\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows -# ADD LINK32 wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswud\fswatcher.exe" /debug /pdb:"vc_mswud\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows - -!ENDIF - -# Begin Target - -# Name "fswatcher - Win32 DLL Universal Release" -# Name "fswatcher - Win32 DLL Universal Debug" -# Name "fswatcher - Win32 DLL Release" -# Name "fswatcher - Win32 DLL Debug" -# Name "fswatcher - Win32 Universal Release" -# Name "fswatcher - Win32 Universal Debug" -# Name "fswatcher - Win32 Release" -# Name "fswatcher - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\fswatcher.cpp -# End Source File -# Begin Source File - -SOURCE=.\..\..\samples\sample.rc -# End Source File -# End Group -# End Target -# End Project - +# Microsoft Developer Studio Project File - Name="fswatcher" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Application" 0x0101 + +CFG=fswatcher - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "fswatcher.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "fswatcher.mak" CFG="fswatcher - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "fswatcher - Win32 DLL Universal Release" (based on "Win32 (x86) Application") +!MESSAGE "fswatcher - Win32 DLL Universal Debug" (based on "Win32 (x86) Application") +!MESSAGE "fswatcher - Win32 DLL Release" (based on "Win32 (x86) Application") +!MESSAGE "fswatcher - Win32 DLL Debug" (based on "Win32 (x86) Application") +!MESSAGE "fswatcher - Win32 Universal Release" (based on "Win32 (x86) Application") +!MESSAGE "fswatcher - Win32 Universal Debug" (based on "Win32 (x86) Application") +!MESSAGE "fswatcher - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "fswatcher - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "fswatcher - Win32 DLL Universal Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswunivudll" +# PROP BASE Intermediate_Dir "vc_mswunivudll\fswatcher" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswunivudll" +# PROP Intermediate_Dir "vc_mswunivudll\fswatcher" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\fswatcher.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\fswatcher.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivudll\fswatcher.exe" /debug /pdb:"vc_mswunivudll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivudll\fswatcher.exe" /debug /pdb:"vc_mswunivudll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows + +!ELSEIF "$(CFG)" == "fswatcher - Win32 DLL Universal Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswunivuddll" +# PROP BASE Intermediate_Dir "vc_mswunivuddll\fswatcher" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswunivuddll" +# PROP Intermediate_Dir "vc_mswunivuddll\fswatcher" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivuddll\fswatcher.exe" /debug /pdb:"vc_mswunivuddll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivuddll\fswatcher.exe" /debug /pdb:"vc_mswunivuddll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows + +!ELSEIF "$(CFG)" == "fswatcher - Win32 DLL Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswudll" +# PROP BASE Intermediate_Dir "vc_mswudll\fswatcher" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswudll" +# PROP Intermediate_Dir "vc_mswudll\fswatcher" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\fswatcher.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\fswatcher.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswudll\fswatcher.exe" /debug /pdb:"vc_mswudll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswudll\fswatcher.exe" /debug /pdb:"vc_mswudll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows + +!ELSEIF "$(CFG)" == "fswatcher - Win32 DLL Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswuddll" +# PROP BASE Intermediate_Dir "vc_mswuddll\fswatcher" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswuddll" +# PROP Intermediate_Dir "vc_mswuddll\fswatcher" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswuddll\fswatcher.exe" /debug /pdb:"vc_mswuddll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswuddll\fswatcher.exe" /debug /pdb:"vc_mswuddll\fswatcher.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows + +!ELSEIF "$(CFG)" == "fswatcher - Win32 Universal Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswunivu" +# PROP BASE Intermediate_Dir "vc_mswunivu\fswatcher" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswunivu" +# PROP Intermediate_Dir "vc_mswunivu\fswatcher" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\fswatcher.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\fswatcher.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivu\fswatcher.exe" /debug /pdb:"vc_mswunivu\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivu\fswatcher.exe" /debug /pdb:"vc_mswunivu\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows + +!ELSEIF "$(CFG)" == "fswatcher - Win32 Universal Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswunivud" +# PROP BASE Intermediate_Dir "vc_mswunivud\fswatcher" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswunivud" +# PROP Intermediate_Dir "vc_mswunivud\fswatcher" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivud\fswatcher.exe" /debug /pdb:"vc_mswunivud\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivud\fswatcher.exe" /debug /pdb:"vc_mswunivud\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows + +!ELSEIF "$(CFG)" == "fswatcher - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswu" +# PROP BASE Intermediate_Dir "vc_mswu\fswatcher" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswu" +# PROP Intermediate_Dir "vc_mswu\fswatcher" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\fswatcher.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\fswatcher.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +# ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswu\fswatcher.exe" /debug /pdb:"vc_mswu\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswu\fswatcher.exe" /debug /pdb:"vc_mswu\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows + +!ELSEIF "$(CFG)" == "fswatcher - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswud" +# PROP BASE Intermediate_Dir "vc_mswud\fswatcher" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswud" +# PROP Intermediate_Dir "vc_mswud\fswatcher" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswud\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswud\fswatcher.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswud\fswatcher.exe" /debug /pdb:"vc_mswud\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswud\fswatcher.exe" /debug /pdb:"vc_mswud\fswatcher.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows + +!ENDIF + +# Begin Target + +# Name "fswatcher - Win32 DLL Universal Release" +# Name "fswatcher - Win32 DLL Universal Debug" +# Name "fswatcher - Win32 DLL Release" +# Name "fswatcher - Win32 DLL Debug" +# Name "fswatcher - Win32 Universal Release" +# Name "fswatcher - Win32 Universal Debug" +# Name "fswatcher - Win32 Release" +# Name "fswatcher - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\fswatcher.cpp +# End Source File +# Begin Source File + +SOURCE=.\..\..\samples\sample.rc +# End Source File +# End Group +# End Target +# End Project + diff --git a/samples/fswatcher/fswatcher_vc7.vcproj b/samples/fswatcher/fswatcher_vc7.vcproj index a58755aad0..5c1d9cbff3 100644 --- a/samples/fswatcher/fswatcher_vc7.vcproj +++ b/samples/fswatcher/fswatcher_vc7.vcproj @@ -1,553 +1,561 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/fswatcher/fswatcher_vc8.vcproj b/samples/fswatcher/fswatcher_vc8.vcproj index 4f50ad2a70..b81baee90d 100644 --- a/samples/fswatcher/fswatcher_vc8.vcproj +++ b/samples/fswatcher/fswatcher_vc8.vcproj @@ -1,818 +1,826 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/fswatcher/fswatcher_vc9.vcproj b/samples/fswatcher/fswatcher_vc9.vcproj index 01ca5bddc5..372fefad18 100644 --- a/samples/fswatcher/fswatcher_vc9.vcproj +++ b/samples/fswatcher/fswatcher_vc9.vcproj @@ -1,790 +1,798 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/fswatcher/makefile.bcc b/samples/fswatcher/makefile.bcc index e9493ab6b1..866daacaa9 100644 --- a/samples/fswatcher/makefile.bcc +++ b/samples/fswatcher/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -64,10 +64,10 @@ LIBTYPE_SUFFIX = lib LIBTYPE_SUFFIX = dll !endif !if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = !endif !if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = !endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG_2 = -Od @@ -76,13 +76,13 @@ __OPTIMIZEFLAG_2 = -Od __OPTIMIZEFLAG_2 = -O2 !endif !if "$(USE_THREADS)" == "0" -__THREADSFLAG_5 = +__THREADSFLAG_5 = !endif !if "$(USE_THREADS)" == "1" __THREADSFLAG_5 = mt !endif !if "$(USE_THREADS)" == "0" -__THREADSFLAG_6 = +__THREADSFLAG_6 = !endif !if "$(USE_THREADS)" == "1" __THREADSFLAG_6 = -tWM @@ -91,13 +91,13 @@ __THREADSFLAG_6 = -tWM __RUNTIME_LIBS_7 = -tWR !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_7 = +__RUNTIME_LIBS_7 = !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_8 = i !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = +__RUNTIME_LIBS_8 = !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -208,7 +208,7 @@ $(OBJS): all: $(OBJS)\fswatcher.exe -clean: +clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\*.csm del $(OBJS)\*.csm diff --git a/samples/fswatcher/makefile.gcc b/samples/fswatcher/makefile.gcc index d1e2b6793c..9870dc2a39 100644 --- a/samples/fswatcher/makefile.gcc +++ b/samples/fswatcher/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -61,10 +61,10 @@ ifeq ($(SHARED),1) LIBTYPE_SUFFIX = dll endif ifeq ($(MONOLITHIC),0) -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = endif ifeq ($(MONOLITHIC),1) -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = endif ifeq ($(BUILD),debug) __OPTIMIZEFLAG_2 = -O0 @@ -76,13 +76,13 @@ ifeq ($(USE_RTTI),0) __RTTIFLAG_5 = -fno-rtti endif ifeq ($(USE_RTTI),1) -__RTTIFLAG_5 = +__RTTIFLAG_5 = endif ifeq ($(USE_EXCEPTIONS),0) __EXCEPTIONSFLAG_6 = -fno-exceptions endif ifeq ($(USE_EXCEPTIONS),1) -__EXCEPTIONSFLAG_6 = +__EXCEPTIONSFLAG_6 = endif ifeq ($(WXUNIV),1) __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -178,17 +178,17 @@ endif endif ifeq ($(BUILD),release) ifeq ($(DEBUG_INFO),default) -__DEBUGINFO = +__DEBUGINFO = endif endif ifeq ($(DEBUG_INFO),0) -__DEBUGINFO = +__DEBUGINFO = endif ifeq ($(DEBUG_INFO),1) __DEBUGINFO = -g endif ifeq ($(USE_THREADS),0) -__THREADSFLAG = +__THREADSFLAG = endif ifeq ($(USE_THREADS),1) __THREADSFLAG = -mthreads @@ -203,7 +203,7 @@ $(OBJS): all: $(OBJS)\fswatcher.exe -clean: +clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\fswatcher.exe del $(OBJS)\fswatcher.exe diff --git a/samples/fswatcher/makefile.unx b/samples/fswatcher/makefile.unx index bb6a65dd6a..e15cb429df 100644 --- a/samples/fswatcher/makefile.unx +++ b/samples/fswatcher/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -10,19 +10,19 @@ # These are configurable options: # ------------------------------------------------------------------------- -# C++ compiler +# C++ compiler CXX = `$(WX_CONFIG) --cxx` -# Standard flags for C++ -CXXFLAGS ?= +# Standard flags for C++ +CXXFLAGS ?= -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS ?= +# Standard preprocessor flags (common for CC and CXX) +CPPFLAGS ?= -# Standard linker flags -LDFLAGS ?= +# Standard linker flags +LDFLAGS ?= -# Location and arguments of wx-config script +# Location and arguments of wx-config script WX_CONFIG ?= wx-config # Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb] @@ -34,7 +34,7 @@ WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --query-linkage`; then echo 1; els # Compile Unicode build of wxWidgets? [0,1] WX_UNICODE ?= $(shell $(WX_CONFIG) --query-chartype | sed 's/unicode/1/;s/ansi/0/') -# Version of the wx library to build against. +# Version of the wx library to build against. WX_VERSION ?= $(shell $(WX_CONFIG) --query-version | sed -e 's/\([0-9]*\)\.\([0-9]*\)/\1\2/') @@ -75,16 +75,16 @@ endif all: test_for_selected_wxbuild fswatcher -install: +install: -uninstall: +uninstall: -clean: +clean: rm -f ./*.o rm -f ./*.d rm -f fswatcher -test_for_selected_wxbuild: +test_for_selected_wxbuild: @$(WX_CONFIG) $(WX_CONFIG_FLAGS) fswatcher: $(FSWATCHER_OBJECTS) diff --git a/samples/fswatcher/makefile.vc b/samples/fswatcher/makefile.vc index eefb408231..be8d9b06d4 100644 --- a/samples/fswatcher/makefile.vc +++ b/samples/fswatcher/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -20,14 +20,14 @@ LIBDIRNAME = \ .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -FSWATCHER_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\fswatcher.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) +FSWATCHER_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\fswatcher.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) FSWATCHER_OBJECTS = \ $(OBJS)\fswatcher_fswatcher.obj FSWATCHER_RESOURCES = \ @@ -87,19 +87,19 @@ LINK_TARGET_CPU = /MACHINE:AMD64 LINK_TARGET_CPU = /MACHINE:IA64 !endif !if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = !endif !if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" __DEBUGINFO_0 = /Zi !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = +__DEBUGINFO_0 = !endif !if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = +__DEBUGINFO_0 = !endif !if "$(DEBUG_INFO)" == "1" __DEBUGINFO_0 = /Zi @@ -108,79 +108,103 @@ __DEBUGINFO_0 = /Zi __DEBUGINFO_1 = /DEBUG !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = +__DEBUGINFO_1 = !endif !if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = +__DEBUGINFO_1 = !endif !if "$(DEBUG_INFO)" == "1" __DEBUGINFO_1 = /DEBUG !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG +____DEBUGRUNTIME_3_p_1 = /d _DEBUG !endif !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = +____DEBUGRUNTIME_3_p_1 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = +____DEBUGRUNTIME_3_p_1 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG +____DEBUGRUNTIME_3_p_1 = /d _DEBUG !endif !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG +__DEBUGRUNTIME_4 = d !endif !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = +__DEBUGRUNTIME_4 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = +__DEBUGRUNTIME_4 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG +__DEBUGRUNTIME_4 = d !endif !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d +__DEBUGRUNTIME_5 = !endif !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = +__DEBUGRUNTIME_5 = /opt:ref /opt:icf !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = +__DEBUGRUNTIME_5 = /opt:ref /opt:icf !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d +__DEBUGRUNTIME_5 = !endif !if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od +__OPTIMIZEFLAG_6 = /Od !endif !if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 +__OPTIMIZEFLAG_6 = /O2 !endif !if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L +__THREADSFLAG_9 = L !endif !if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T +__THREADSFLAG_9 = T !endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D +__RUNTIME_LIBS_10 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) !endif !if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = +__RTTIFLAG_11 = !endif !if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR +__RTTIFLAG_11 = /GR !endif !if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = +__EXCEPTIONSFLAG_12 = !endif !if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc +__EXCEPTIONSFLAG_12 = /EHsc !endif !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" __NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ @@ -291,7 +315,7 @@ $(OBJS): all: $(OBJS)\fswatcher.exe -clean: +clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\*.pch del $(OBJS)\*.pch @@ -305,7 +329,7 @@ $(OBJS)\fswatcher.exe: $(FSWATCHER_OBJECTS) $(OBJS)\fswatcher_sample.res << $(OBJS)\fswatcher_sample.res: .\..\..\samples\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc $(OBJS)\fswatcher_fswatcher.obj: .\fswatcher.cpp $(CXX) /c /nologo /TP /Fo$@ $(FSWATCHER_CXXFLAGS) .\fswatcher.cpp diff --git a/samples/fswatcher/makefile.wat b/samples/fswatcher/makefile.wat index 2d65a1daa4..0e18d598bc 100644 --- a/samples/fswatcher/makefile.wat +++ b/samples/fswatcher/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -63,10 +63,10 @@ LIBTYPE_SUFFIX = dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = !endif !ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = !endif __DEBUGINFO_0 = !ifeq BUILD debug @@ -93,11 +93,11 @@ __DEBUGINFO_1 = debug all !endif !ifeq BUILD release !ifeq DEBUG_INFO default -__DEBUGINFO_1 = +__DEBUGINFO_1 = !endif !endif !ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = +__DEBUGINFO_1 = !endif !ifeq DEBUG_INFO 1 __DEBUGINFO_1 = debug all @@ -111,7 +111,7 @@ __OPTIMIZEFLAG_2 = -ot -ox !endif __THREADSFLAG_5 = !ifeq USE_THREADS 0 -__THREADSFLAG_5 = +__THREADSFLAG_5 = !endif !ifeq USE_THREADS 1 __THREADSFLAG_5 = -bm @@ -121,18 +121,18 @@ __RUNTIME_LIBS_6 = __RUNTIME_LIBS_6 = -br !endif !ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = +__RUNTIME_LIBS_6 = !endif __RTTIFLAG_7 = !ifeq USE_RTTI 0 -__RTTIFLAG_7 = +__RTTIFLAG_7 = !endif !ifeq USE_RTTI 1 __RTTIFLAG_7 = -xr !endif __EXCEPTIONSFLAG_8 = !ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = +__EXCEPTIONSFLAG_8 = !endif !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG_8 = -xs @@ -232,7 +232,7 @@ $(OBJS) : all : .SYMBOLIC $(OBJS)\fswatcher.exe -clean : .SYMBOLIC +clean : .SYMBOLIC -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc diff --git a/samples/grid/Makefile.in b/samples/grid/Makefile.in index 9da2dd239c..4c7a110c06 100644 --- a/samples/grid/Makefile.in +++ b/samples/grid/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/grid/grid.dsp b/samples/grid/grid.dsp index 2490d4a69b..ddae53dead 100644 --- a/samples/grid/grid.dsp +++ b/samples/grid/grid.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\grid" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\grid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\grid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\grid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\grid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\grid" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\grid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\grid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\grid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\grid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\grid" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\grid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\grid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\grid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\grid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\grid" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\grid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\grid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\grid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\grid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/grid/grid_vc7.vcproj b/samples/grid/grid_vc7.vcproj index 2f9e56539c..59126cb559 100644 --- a/samples/grid/grid_vc7.vcproj +++ b/samples/grid/grid_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\grid.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\grid.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\grid.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\grid.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\grid.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\grid.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\grid.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\grid.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\grid.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\grid.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\grid.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\grid.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -GRID_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\grid.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -GRID_OBJECTS = \ - $(OBJS)\grid_griddemo.obj \ - $(OBJS)\grid_griddemo.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_ADV_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\grid.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\grid.exe del $(OBJS)\grid.exe - -if exist $(OBJS)\grid.ilk del $(OBJS)\grid.ilk - -if exist $(OBJS)\grid.pdb del $(OBJS)\grid.pdb - -$(OBJS)\grid.exe: $(GRID_OBJECTS) $(OBJS)\grid_griddemo.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\grid.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(GRID_OBJECTS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\grid_griddemo.obj: .\griddemo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(GRID_CXXFLAGS) .\griddemo.cpp - -$(OBJS)\grid_griddemo.res: .\griddemo.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\griddemo.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +GRID_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\grid.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +GRID_OBJECTS = \ + $(OBJS)\grid_griddemo.obj +GRID_RESOURCES = \ + $(OBJS)\grid_griddemo.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_ADV_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\grid.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\grid.exe del $(OBJS)\grid.exe + -if exist $(OBJS)\grid.ilk del $(OBJS)\grid.ilk + -if exist $(OBJS)\grid.pdb del $(OBJS)\grid.pdb + +$(OBJS)\grid.exe: $(GRID_OBJECTS) $(OBJS)\grid_griddemo.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\grid.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(GRID_OBJECTS) $(GRID_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\grid_griddemo.obj: .\griddemo.cpp + $(CXX) /c /nologo /TP /Fo$@ $(GRID_CXXFLAGS) .\griddemo.cpp + +$(OBJS)\grid_griddemo.res: .\griddemo.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\griddemo.rc + diff --git a/samples/grid/makefile.wat b/samples/grid/makefile.wat index 467246ecc8..b824d16b23 100644 --- a/samples/grid/makefile.wat +++ b/samples/grid/makefile.wat @@ -1,265 +1,265 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_ADV_p = -!ifeq MONOLITHIC 0 -__WXLIB_ADV_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -GRID_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -GRID_OBJECTS = & - $(OBJS)\grid_griddemo.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\grid.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\grid.exe del $(OBJS)\grid.exe - -$(OBJS)\grid.exe : $(GRID_OBJECTS) $(OBJS)\grid_griddemo.res - @%create $(OBJS)\grid.lbc - @%append $(OBJS)\grid.lbc option quiet - @%append $(OBJS)\grid.lbc name $^@ - @%append $(OBJS)\grid.lbc option caseexact - @%append $(OBJS)\grid.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(GRID_OBJECTS)) do @%append $(OBJS)\grid.lbc file %i - @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\grid.lbc library %i - @%append $(OBJS)\grid.lbc option resource=$(OBJS)\grid_griddemo.res - @for %i in () do @%append $(OBJS)\grid.lbc option stack=%i - wlink @$(OBJS)\grid.lbc - -$(OBJS)\grid_griddemo.obj : .AUTODEPEND .\griddemo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(GRID_CXXFLAGS) $< - -$(OBJS)\grid_griddemo.res : .AUTODEPEND .\griddemo.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +GRID_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +GRID_OBJECTS = & + $(OBJS)\grid_griddemo.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\grid.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\grid.exe del $(OBJS)\grid.exe + +$(OBJS)\grid.exe : $(GRID_OBJECTS) $(OBJS)\grid_griddemo.res + @%create $(OBJS)\grid.lbc + @%append $(OBJS)\grid.lbc option quiet + @%append $(OBJS)\grid.lbc name $^@ + @%append $(OBJS)\grid.lbc option caseexact + @%append $(OBJS)\grid.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(GRID_OBJECTS)) do @%append $(OBJS)\grid.lbc file %i + @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\grid.lbc library %i + @%append $(OBJS)\grid.lbc option resource=$(OBJS)\grid_griddemo.res + @for %i in () do @%append $(OBJS)\grid.lbc option stack=%i + wlink @$(OBJS)\grid.lbc + +$(OBJS)\grid_griddemo.obj : .AUTODEPEND .\griddemo.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(GRID_CXXFLAGS) $< + +$(OBJS)\grid_griddemo.res : .AUTODEPEND .\griddemo.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in index 8fe91e6ea8..981c17efc7 100644 --- a/samples/help/Makefile.in +++ b/samples/help/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/help/help.dsp b/samples/help/help.dsp index 2a7bf3b343..bada8bac5f 100644 --- a/samples/help/help.dsp +++ b/samples/help/help.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\help" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\help.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\help.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\help.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\help.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\help" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\help.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\help.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\help.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\help.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\help" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\help.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\help.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\help.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\help.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\help" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\help.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\help.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\help.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\help.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/help/help_vc7.vcproj b/samples/help/help_vc7.vcproj index 4c92882d43..7e6f0525a5 100644 --- a/samples/help/help_vc7.vcproj +++ b/samples/help/help_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\help.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\help.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\help.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\help.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\help.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\help.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\help.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\help.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\help.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\help.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\help.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\help.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -HELP_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\help.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -HELP_OBJECTS = \ - $(OBJS)\help_demo.obj \ - $(OBJS)\help_demo.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_HTML_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_ADV_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\help.exe data data_doc - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\help.exe del $(OBJS)\help.exe - -if exist $(OBJS)\help.ilk del $(OBJS)\help.ilk - -if exist $(OBJS)\help.pdb del $(OBJS)\help.pdb - -$(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_demo.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\help.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(HELP_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (back.gif bullet.bmp contents.gif cshelp.txt doc.chm doc.cnt doc.hhc doc.hhk doc.hhp doc.hlp doc.hpj doc.zip forward.gif up.gif) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -data_doc: - if not exist $(OBJS)\doc mkdir $(OBJS)\doc - for %f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc - -$(OBJS)\help_demo.obj: .\demo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HELP_CXXFLAGS) .\demo.cpp - -$(OBJS)\help_demo.res: .\demo.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\demo.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +HELP_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\help.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +HELP_OBJECTS = \ + $(OBJS)\help_demo.obj +HELP_RESOURCES = \ + $(OBJS)\help_demo.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_ADV_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\help.exe data data_doc + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\help.exe del $(OBJS)\help.exe + -if exist $(OBJS)\help.ilk del $(OBJS)\help.ilk + -if exist $(OBJS)\help.pdb del $(OBJS)\help.pdb + +$(OBJS)\help.exe: $(HELP_OBJECTS) $(OBJS)\help_demo.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\help.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(HELP_OBJECTS) $(HELP_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (back.gif bullet.bmp contents.gif cshelp.txt doc.chm doc.cnt doc.hhc doc.hhk doc.hhp doc.hlp doc.hpj doc.zip forward.gif up.gif) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +data_doc: + if not exist $(OBJS)\doc mkdir $(OBJS)\doc + for %f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc + +$(OBJS)\help_demo.obj: .\demo.cpp + $(CXX) /c /nologo /TP /Fo$@ $(HELP_CXXFLAGS) .\demo.cpp + +$(OBJS)\help_demo.res: .\demo.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\demo.rc + diff --git a/samples/help/makefile.wat b/samples/help/makefile.wat index e3ed859f8a..af47309f6c 100644 --- a/samples/help/makefile.wat +++ b/samples/help/makefile.wat @@ -1,278 +1,278 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_ADV_p = -!ifeq MONOLITHIC 0 -__WXLIB_ADV_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -HELP_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -HELP_OBJECTS = & - $(OBJS)\help_demo.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\help.exe data data_doc - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\help.exe del $(OBJS)\help.exe - -$(OBJS)\help.exe : $(HELP_OBJECTS) $(OBJS)\help_demo.res - @%create $(OBJS)\help.lbc - @%append $(OBJS)\help.lbc option quiet - @%append $(OBJS)\help.lbc name $^@ - @%append $(OBJS)\help.lbc option caseexact - @%append $(OBJS)\help.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(HELP_OBJECTS)) do @%append $(OBJS)\help.lbc file %i - @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\help.lbc library %i - @%append $(OBJS)\help.lbc option resource=$(OBJS)\help_demo.res - @for %i in () do @%append $(OBJS)\help.lbc option stack=%i - wlink @$(OBJS)\help.lbc - -data : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (back.gif bullet.bmp contents.gif cshelp.txt doc.chm doc.cnt doc.hhc doc.hhk doc.hhp doc.hlp doc.hpj doc.zip forward.gif up.gif) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -data_doc : .SYMBOLIC - if not exist $(OBJS)\doc mkdir $(OBJS)\doc - for %f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc - -$(OBJS)\help_demo.obj : .AUTODEPEND .\demo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HELP_CXXFLAGS) $< - -$(OBJS)\help_demo.res : .AUTODEPEND .\demo.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +HELP_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +HELP_OBJECTS = & + $(OBJS)\help_demo.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\help.exe data data_doc + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\help.exe del $(OBJS)\help.exe + +$(OBJS)\help.exe : $(HELP_OBJECTS) $(OBJS)\help_demo.res + @%create $(OBJS)\help.lbc + @%append $(OBJS)\help.lbc option quiet + @%append $(OBJS)\help.lbc name $^@ + @%append $(OBJS)\help.lbc option caseexact + @%append $(OBJS)\help.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(HELP_OBJECTS)) do @%append $(OBJS)\help.lbc file %i + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\help.lbc library %i + @%append $(OBJS)\help.lbc option resource=$(OBJS)\help_demo.res + @for %i in () do @%append $(OBJS)\help.lbc option stack=%i + wlink @$(OBJS)\help.lbc + +data : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (back.gif bullet.bmp contents.gif cshelp.txt doc.chm doc.cnt doc.hhc doc.hhk doc.hhp doc.hlp doc.hpj doc.zip forward.gif up.gif) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +data_doc : .SYMBOLIC + if not exist $(OBJS)\doc mkdir $(OBJS)\doc + for %f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc + +$(OBJS)\help_demo.obj : .AUTODEPEND .\demo.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(HELP_CXXFLAGS) $< + +$(OBJS)\help_demo.res : .AUTODEPEND .\demo.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in index 429f888d14..415603adfc 100644 --- a/samples/htlbox/Makefile.in +++ b/samples/htlbox/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/htlbox/htlbox.dsp b/samples/htlbox/htlbox.dsp index d68df27085..10ff7753f2 100644 --- a/samples/htlbox/htlbox.dsp +++ b/samples/htlbox/htlbox.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\htlbox" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\htlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\htlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\htlbox.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\htlbox.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\htlbox" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\htlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\htlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\htlbox.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\htlbox.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\htlbox" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\htlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\htlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\htlbox.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\htlbox.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\htlbox" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\htlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\htlbox.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\htlbox.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\htlbox.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/htlbox/htlbox_vc7.vcproj b/samples/htlbox/htlbox_vc7.vcproj index 0e051fb81d..c3d2fef461 100644 --- a/samples/htlbox/htlbox_vc7.vcproj +++ b/samples/htlbox/htlbox_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\htlbox.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\htlbox.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\htlbox.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\htlbox.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\htlbox.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\htlbox.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\htlbox.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\htlbox.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\htlbox.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\htlbox.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\htlbox.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\htlbox.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -HTLBOX_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\htlbox.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -HTLBOX_OBJECTS = \ - $(OBJS)\htlbox_htlbox.obj \ - $(OBJS)\htlbox_htlbox.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_HTML_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\htlbox.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\htlbox.exe del $(OBJS)\htlbox.exe - -if exist $(OBJS)\htlbox.ilk del $(OBJS)\htlbox.ilk - -if exist $(OBJS)\htlbox.pdb del $(OBJS)\htlbox.pdb - -$(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\htlbox.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(HTLBOX_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\htlbox_htlbox.obj: .\htlbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTLBOX_CXXFLAGS) .\htlbox.cpp - -$(OBJS)\htlbox_htlbox.res: .\htlbox.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\htlbox.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +HTLBOX_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\htlbox.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +HTLBOX_OBJECTS = \ + $(OBJS)\htlbox_htlbox.obj +HTLBOX_RESOURCES = \ + $(OBJS)\htlbox_htlbox.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\htlbox.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\htlbox.exe del $(OBJS)\htlbox.exe + -if exist $(OBJS)\htlbox.ilk del $(OBJS)\htlbox.ilk + -if exist $(OBJS)\htlbox.pdb del $(OBJS)\htlbox.pdb + +$(OBJS)\htlbox.exe: $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\htlbox.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(HTLBOX_OBJECTS) $(HTLBOX_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\htlbox_htlbox.obj: .\htlbox.cpp + $(CXX) /c /nologo /TP /Fo$@ $(HTLBOX_CXXFLAGS) .\htlbox.cpp + +$(OBJS)\htlbox_htlbox.res: .\htlbox.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\htlbox.rc + diff --git a/samples/htlbox/makefile.wat b/samples/htlbox/makefile.wat index 46274a90b8..aa0eebbf91 100644 --- a/samples/htlbox/makefile.wat +++ b/samples/htlbox/makefile.wat @@ -1,265 +1,265 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -HTLBOX_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -HTLBOX_OBJECTS = & - $(OBJS)\htlbox_htlbox.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\htlbox.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\htlbox.exe del $(OBJS)\htlbox.exe - -$(OBJS)\htlbox.exe : $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox.res - @%create $(OBJS)\htlbox.lbc - @%append $(OBJS)\htlbox.lbc option quiet - @%append $(OBJS)\htlbox.lbc name $^@ - @%append $(OBJS)\htlbox.lbc option caseexact - @%append $(OBJS)\htlbox.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(HTLBOX_OBJECTS)) do @%append $(OBJS)\htlbox.lbc file %i - @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\htlbox.lbc library %i - @%append $(OBJS)\htlbox.lbc option resource=$(OBJS)\htlbox_htlbox.res - @for %i in () do @%append $(OBJS)\htlbox.lbc option stack=%i - wlink @$(OBJS)\htlbox.lbc - -$(OBJS)\htlbox_htlbox.obj : .AUTODEPEND .\htlbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTLBOX_CXXFLAGS) $< - -$(OBJS)\htlbox_htlbox.res : .AUTODEPEND .\htlbox.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +HTLBOX_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +HTLBOX_OBJECTS = & + $(OBJS)\htlbox_htlbox.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\htlbox.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\htlbox.exe del $(OBJS)\htlbox.exe + +$(OBJS)\htlbox.exe : $(HTLBOX_OBJECTS) $(OBJS)\htlbox_htlbox.res + @%create $(OBJS)\htlbox.lbc + @%append $(OBJS)\htlbox.lbc option quiet + @%append $(OBJS)\htlbox.lbc name $^@ + @%append $(OBJS)\htlbox.lbc option caseexact + @%append $(OBJS)\htlbox.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(HTLBOX_OBJECTS)) do @%append $(OBJS)\htlbox.lbc file %i + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\htlbox.lbc library %i + @%append $(OBJS)\htlbox.lbc option resource=$(OBJS)\htlbox_htlbox.res + @for %i in () do @%append $(OBJS)\htlbox.lbc option stack=%i + wlink @$(OBJS)\htlbox.lbc + +$(OBJS)\htlbox_htlbox.obj : .AUTODEPEND .\htlbox.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(HTLBOX_CXXFLAGS) $< + +$(OBJS)\htlbox_htlbox.res : .AUTODEPEND .\htlbox.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/html/Makefile.in b/samples/html/Makefile.in index 9690b32754..f119ecf7ff 100644 --- a/samples/html/Makefile.in +++ b/samples/html/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/about/Makefile.in b/samples/html/about/Makefile.in index 097fbe4471..9e15a70e14 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.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/about/about.dsp b/samples/html/about/about.dsp index 2b1b62a093..09fbfabd09 100644 --- a/samples/html/about/about.dsp +++ b/samples/html/about/about.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\about" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\about.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\about.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\about.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\about.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\about" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\about.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\about.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\about.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\about.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\about" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\about.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\about.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\about.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\about.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\about" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\about.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\about.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\about.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\about.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH diff --git a/samples/html/about/about_vc7.vcproj b/samples/html/about/about_vc7.vcproj index 11df47f1f2..e74b6bf71b 100644 --- a/samples/html/about/about_vc7.vcproj +++ b/samples/html/about/about_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\about.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\about.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\about.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\about.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\about.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\about.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\about.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\about.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\about.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\about.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\about.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\about.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -ABOUT_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\about.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ - $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_9) \ - $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS) -ABOUT_OBJECTS = \ - $(OBJS)\about_about.obj \ - $(OBJS)\about_about.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_HTML_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\about.exe data_files - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\about.exe del $(OBJS)\about.exe - -if exist $(OBJS)\about.ilk del $(OBJS)\about.ilk - -if exist $(OBJS)\about.pdb del $(OBJS)\about.pdb - -$(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_about.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\about.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(ABOUT_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -data_files: - if not exist $(OBJS)\data mkdir $(OBJS)\data - for %f in (about.htm logo.png) do if not exist $(OBJS)\data\%f copy .\data\%f $(OBJS)\data - -$(OBJS)\about_about.obj: .\about.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ABOUT_CXXFLAGS) .\about.cpp - -$(OBJS)\about_about.res: .\about.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\about.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +ABOUT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\about.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \ + $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +ABOUT_OBJECTS = \ + $(OBJS)\about_about.obj +ABOUT_RESOURCES = \ + $(OBJS)\about_about.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\about.exe data_files + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\about.exe del $(OBJS)\about.exe + -if exist $(OBJS)\about.ilk del $(OBJS)\about.ilk + -if exist $(OBJS)\about.pdb del $(OBJS)\about.pdb + +$(OBJS)\about.exe: $(ABOUT_OBJECTS) $(OBJS)\about_about.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\about.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(ABOUT_OBJECTS) $(ABOUT_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +data_files: + if not exist $(OBJS)\data mkdir $(OBJS)\data + for %f in (about.htm logo.png) do if not exist $(OBJS)\data\%f copy .\data\%f $(OBJS)\data + +$(OBJS)\about_about.obj: .\about.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ABOUT_CXXFLAGS) .\about.cpp + +$(OBJS)\about_about.res: .\about.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\about.rc + diff --git a/samples/html/about/makefile.wat b/samples/html/about/makefile.wat index 147234ec9c..453fc82a0f 100644 --- a/samples/html/about/makefile.wat +++ b/samples/html/about/makefile.wat @@ -1,269 +1,269 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -ABOUT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & - $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) -ABOUT_OBJECTS = & - $(OBJS)\about_about.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\about.exe data_files - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\about.exe del $(OBJS)\about.exe - -$(OBJS)\about.exe : $(ABOUT_OBJECTS) $(OBJS)\about_about.res - @%create $(OBJS)\about.lbc - @%append $(OBJS)\about.lbc option quiet - @%append $(OBJS)\about.lbc name $^@ - @%append $(OBJS)\about.lbc option caseexact - @%append $(OBJS)\about.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(ABOUT_OBJECTS)) do @%append $(OBJS)\about.lbc file %i - @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\about.lbc library %i - @%append $(OBJS)\about.lbc option resource=$(OBJS)\about_about.res - @for %i in () do @%append $(OBJS)\about.lbc option stack=%i - wlink @$(OBJS)\about.lbc - -data_files : .SYMBOLIC - if not exist $(OBJS)\data mkdir $(OBJS)\data - for %f in (about.htm logo.png) do if not exist $(OBJS)\data\%f copy .\data\%f $(OBJS)\data - -$(OBJS)\about_about.obj : .AUTODEPEND .\about.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ABOUT_CXXFLAGS) $< - -$(OBJS)\about_about.res : .AUTODEPEND .\about.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +ABOUT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & + $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & + $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) +ABOUT_OBJECTS = & + $(OBJS)\about_about.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\about.exe data_files + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\about.exe del $(OBJS)\about.exe + +$(OBJS)\about.exe : $(ABOUT_OBJECTS) $(OBJS)\about_about.res + @%create $(OBJS)\about.lbc + @%append $(OBJS)\about.lbc option quiet + @%append $(OBJS)\about.lbc name $^@ + @%append $(OBJS)\about.lbc option caseexact + @%append $(OBJS)\about.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(ABOUT_OBJECTS)) do @%append $(OBJS)\about.lbc file %i + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\about.lbc library %i + @%append $(OBJS)\about.lbc option resource=$(OBJS)\about_about.res + @for %i in () do @%append $(OBJS)\about.lbc option stack=%i + wlink @$(OBJS)\about.lbc + +data_files : .SYMBOLIC + if not exist $(OBJS)\data mkdir $(OBJS)\data + for %f in (about.htm logo.png) do if not exist $(OBJS)\data\%f copy .\data\%f $(OBJS)\data + +$(OBJS)\about_about.obj : .AUTODEPEND .\about.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ABOUT_CXXFLAGS) $< + +$(OBJS)\about_about.res : .AUTODEPEND .\about.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + diff --git a/samples/html/help/Makefile.in b/samples/html/help/Makefile.in index 50e9b04b3f..5af57aa456 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.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/help/help.dsp b/samples/html/help/help.dsp index 61f26589f0..7831387bbc 100644 --- a/samples/html/help/help.dsp +++ b/samples/html/help/help.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\htmlhelp" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\htmlhelp.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\htmlhelp.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\htmlhelp.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\htmlhelp.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\htmlhelp" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\htmlhelp.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\htmlhelp.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\htmlhelp.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\htmlhelp.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\htmlhelp" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\htmlhelp.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\htmlhelp.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\htmlhelp.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\htmlhelp.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\htmlhelp" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\htmlhelp.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\htmlhelp.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\htmlhelp.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\htmlhelp.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH diff --git a/samples/html/help/help_vc7.vcproj b/samples/html/help/help_vc7.vcproj index 03726ae4c1..3ee64dd21b 100644 --- a/samples/html/help/help_vc7.vcproj +++ b/samples/html/help/help_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\htmlhelp.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\htmlhelp.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\htmlhelp.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\htmlhelp.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\htmlhelp.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\htmlhelp.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\htmlhelp.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\htmlhelp.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\htmlhelp.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\htmlhelp.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\htmlhelp.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\htmlhelp.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -HTMLHELP_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\htmlhelp.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ - $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_9) \ - $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS) -HTMLHELP_OBJECTS = \ - $(OBJS)\htmlhelp_help.obj \ - $(OBJS)\htmlhelp_help.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_HTML_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\htmlhelp.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\htmlhelp.exe del $(OBJS)\htmlhelp.exe - -if exist $(OBJS)\htmlhelp.ilk del $(OBJS)\htmlhelp.ilk - -if exist $(OBJS)\htmlhelp.pdb del $(OBJS)\htmlhelp.pdb - -$(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\htmlhelp.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(HTMLHELP_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -data: - if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles - for %f in (Index.hhk another.hhc another.hhp another.htm book1.htm book2.htm contents.hhc main.htm page2-b.htm testing.hhp) do if not exist $(OBJS)\helpfiles\%f copy .\helpfiles\%f $(OBJS)\helpfiles - -$(OBJS)\htmlhelp_help.obj: .\help.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLHELP_CXXFLAGS) .\help.cpp - -$(OBJS)\htmlhelp_help.res: .\help.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\help.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +HTMLHELP_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\htmlhelp.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \ + $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +HTMLHELP_OBJECTS = \ + $(OBJS)\htmlhelp_help.obj +HTMLHELP_RESOURCES = \ + $(OBJS)\htmlhelp_help.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\htmlhelp.exe data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\htmlhelp.exe del $(OBJS)\htmlhelp.exe + -if exist $(OBJS)\htmlhelp.ilk del $(OBJS)\htmlhelp.ilk + -if exist $(OBJS)\htmlhelp.pdb del $(OBJS)\htmlhelp.pdb + +$(OBJS)\htmlhelp.exe: $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\htmlhelp.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(HTMLHELP_OBJECTS) $(HTMLHELP_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +data: + if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles + for %f in (Index.hhk another.hhc another.hhp another.htm book1.htm book2.htm contents.hhc main.htm page2-b.htm testing.hhp) do if not exist $(OBJS)\helpfiles\%f copy .\helpfiles\%f $(OBJS)\helpfiles + +$(OBJS)\htmlhelp_help.obj: .\help.cpp + $(CXX) /c /nologo /TP /Fo$@ $(HTMLHELP_CXXFLAGS) .\help.cpp + +$(OBJS)\htmlhelp_help.res: .\help.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\help.rc + diff --git a/samples/html/help/makefile.wat b/samples/html/help/makefile.wat index 844b44004e..fa593696e8 100644 --- a/samples/html/help/makefile.wat +++ b/samples/html/help/makefile.wat @@ -1,269 +1,269 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -HTMLHELP_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & - $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) -HTMLHELP_OBJECTS = & - $(OBJS)\htmlhelp_help.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\htmlhelp.exe data - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\htmlhelp.exe del $(OBJS)\htmlhelp.exe - -$(OBJS)\htmlhelp.exe : $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help.res - @%create $(OBJS)\htmlhelp.lbc - @%append $(OBJS)\htmlhelp.lbc option quiet - @%append $(OBJS)\htmlhelp.lbc name $^@ - @%append $(OBJS)\htmlhelp.lbc option caseexact - @%append $(OBJS)\htmlhelp.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(HTMLHELP_OBJECTS)) do @%append $(OBJS)\htmlhelp.lbc file %i - @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\htmlhelp.lbc library %i - @%append $(OBJS)\htmlhelp.lbc option resource=$(OBJS)\htmlhelp_help.res - @for %i in () do @%append $(OBJS)\htmlhelp.lbc option stack=%i - wlink @$(OBJS)\htmlhelp.lbc - -data : .SYMBOLIC - if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles - for %f in (Index.hhk another.hhc another.hhp another.htm book1.htm book2.htm contents.hhc main.htm page2-b.htm testing.hhp) do if not exist $(OBJS)\helpfiles\%f copy .\helpfiles\%f $(OBJS)\helpfiles - -$(OBJS)\htmlhelp_help.obj : .AUTODEPEND .\help.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLHELP_CXXFLAGS) $< - -$(OBJS)\htmlhelp_help.res : .AUTODEPEND .\help.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +HTMLHELP_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & + $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & + $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) +HTMLHELP_OBJECTS = & + $(OBJS)\htmlhelp_help.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\htmlhelp.exe data + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\htmlhelp.exe del $(OBJS)\htmlhelp.exe + +$(OBJS)\htmlhelp.exe : $(HTMLHELP_OBJECTS) $(OBJS)\htmlhelp_help.res + @%create $(OBJS)\htmlhelp.lbc + @%append $(OBJS)\htmlhelp.lbc option quiet + @%append $(OBJS)\htmlhelp.lbc name $^@ + @%append $(OBJS)\htmlhelp.lbc option caseexact + @%append $(OBJS)\htmlhelp.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(HTMLHELP_OBJECTS)) do @%append $(OBJS)\htmlhelp.lbc file %i + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\htmlhelp.lbc library %i + @%append $(OBJS)\htmlhelp.lbc option resource=$(OBJS)\htmlhelp_help.res + @for %i in () do @%append $(OBJS)\htmlhelp.lbc option stack=%i + wlink @$(OBJS)\htmlhelp.lbc + +data : .SYMBOLIC + if not exist $(OBJS)\helpfiles mkdir $(OBJS)\helpfiles + for %f in (Index.hhk another.hhc another.hhp another.htm book1.htm book2.htm contents.hhc main.htm page2-b.htm testing.hhp) do if not exist $(OBJS)\helpfiles\%f copy .\helpfiles\%f $(OBJS)\helpfiles + +$(OBJS)\htmlhelp_help.obj : .AUTODEPEND .\help.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(HTMLHELP_CXXFLAGS) $< + +$(OBJS)\htmlhelp_help.res : .AUTODEPEND .\help.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + diff --git a/samples/html/helpview/Makefile.in b/samples/html/helpview/Makefile.in index 9e5c2005d5..d13d825b3e 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.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/helpview/helpview.dsp b/samples/html/helpview/helpview.dsp index fdbe8804dc..d394379e8d 100644 --- a/samples/html/helpview/helpview.dsp +++ b/samples/html/helpview/helpview.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\helpview" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\helpview" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\helpview" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\helpview" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH diff --git a/samples/html/helpview/helpview_vc7.vcproj b/samples/html/helpview/helpview_vc7.vcproj index 878f4cc9db..f221499719 100644 --- a/samples/html/helpview/helpview_vc7.vcproj +++ b/samples/html/helpview/helpview_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\helpview.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\helpview.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\helpview.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\helpview.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\helpview.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\helpview.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\helpview.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\helpview.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\helpview.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\helpview.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\helpview.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\helpview.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -HELPVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\helpview.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ - $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_9) \ - $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS) -HELPVIEW_OBJECTS = \ - $(OBJS)\helpview_helpview.obj \ - $(OBJS)\helpview_helpview.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_HTML_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\helpview.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe - -if exist $(OBJS)\helpview.ilk del $(OBJS)\helpview.ilk - -if exist $(OBJS)\helpview.pdb del $(OBJS)\helpview.pdb - -$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\helpview.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(HELPVIEW_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\helpview_helpview.obj: .\helpview.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HELPVIEW_CXXFLAGS) .\helpview.cpp - -$(OBJS)\helpview_helpview.res: .\helpview.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\helpview.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +HELPVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\helpview.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \ + $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +HELPVIEW_OBJECTS = \ + $(OBJS)\helpview_helpview.obj +HELPVIEW_RESOURCES = \ + $(OBJS)\helpview_helpview.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\helpview.exe data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe + -if exist $(OBJS)\helpview.ilk del $(OBJS)\helpview.ilk + -if exist $(OBJS)\helpview.pdb del $(OBJS)\helpview.pdb + +$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\helpview.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(HELPVIEW_OBJECTS) $(HELPVIEW_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\helpview_helpview.obj: .\helpview.cpp + $(CXX) /c /nologo /TP /Fo$@ $(HELPVIEW_CXXFLAGS) .\helpview.cpp + +$(OBJS)\helpview_helpview.res: .\helpview.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\helpview.rc + diff --git a/samples/html/helpview/makefile.wat b/samples/html/helpview/makefile.wat index 1ae05e3640..c0f728bbc7 100644 --- a/samples/html/helpview/makefile.wat +++ b/samples/html/helpview/makefile.wat @@ -1,269 +1,269 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -HELPVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & - $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) -HELPVIEW_OBJECTS = & - $(OBJS)\helpview_helpview.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\helpview.exe data - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe - -$(OBJS)\helpview.exe : $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res - @%create $(OBJS)\helpview.lbc - @%append $(OBJS)\helpview.lbc option quiet - @%append $(OBJS)\helpview.lbc name $^@ - @%append $(OBJS)\helpview.lbc option caseexact - @%append $(OBJS)\helpview.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(HELPVIEW_OBJECTS)) do @%append $(OBJS)\helpview.lbc file %i - @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\helpview.lbc library %i - @%append $(OBJS)\helpview.lbc option resource=$(OBJS)\helpview_helpview.res - @for %i in () do @%append $(OBJS)\helpview.lbc option stack=%i - wlink @$(OBJS)\helpview.lbc - -data : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\helpview_helpview.obj : .AUTODEPEND .\helpview.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HELPVIEW_CXXFLAGS) $< - -$(OBJS)\helpview_helpview.res : .AUTODEPEND .\helpview.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +HELPVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & + $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & + $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) +HELPVIEW_OBJECTS = & + $(OBJS)\helpview_helpview.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\helpview.exe data + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe + +$(OBJS)\helpview.exe : $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res + @%create $(OBJS)\helpview.lbc + @%append $(OBJS)\helpview.lbc option quiet + @%append $(OBJS)\helpview.lbc name $^@ + @%append $(OBJS)\helpview.lbc option caseexact + @%append $(OBJS)\helpview.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(HELPVIEW_OBJECTS)) do @%append $(OBJS)\helpview.lbc file %i + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\helpview.lbc library %i + @%append $(OBJS)\helpview.lbc option resource=$(OBJS)\helpview_helpview.res + @for %i in () do @%append $(OBJS)\helpview.lbc option stack=%i + wlink @$(OBJS)\helpview.lbc + +data : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\helpview_helpview.obj : .AUTODEPEND .\helpview.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(HELPVIEW_CXXFLAGS) $< + +$(OBJS)\helpview_helpview.res : .AUTODEPEND .\helpview.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + diff --git a/samples/html/htmlctrl/Makefile.in b/samples/html/htmlctrl/Makefile.in index c676f9d042..6cf7d6d65e 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.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/htmlctrl/makefile.unx b/samples/html/htmlctrl/makefile.unx index bc906fcc2e..2544522717 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.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/makefile.bcc b/samples/html/makefile.bcc index ca9b0a52bf..9ca6bb5716 100644 --- a/samples/html/makefile.bcc +++ b/samples/html/makefile.bcc @@ -1,133 +1,133 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -.autodepend - -!ifndef BCCDIR -!ifndef MAKEDIR -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif -BCCDIR = $(MAKEDIR)\.. -!endif - -!include ../../build/msw/config.bcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ - -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \ - -DCPP="$(CPP)" -DSHARED="$(SHARED)" -DWXUNIV="$(WXUNIV)" \ - -DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" -DBUILD="$(BUILD)" \ - -DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \ - -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \ - -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \ - -DUSE_AUI="$(USE_AUI)" -DUSE_RIBBON="$(USE_RIBBON)" \ - -DUSE_PROPGRID="$(USE_PROPGRID)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \ - -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \ - -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \ - -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \ - -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \ - -DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \ - -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \ - -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" - -### Conditionally set variables: ### - - - -### Targets: ### - -all: about help helpview printing test virtual widget zip - -clean: - -if exist .\*.obj del .\*.obj - -if exist .\*.res del .\*.res - -if exist .\*.csm del .\*.csm - @echo cd about >about.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>about.bat - call about.bat - @del about.bat - @echo cd help >help.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>help.bat - call help.bat - @del help.bat - @echo cd helpview >helpview.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>helpview.bat - call helpview.bat - @del helpview.bat - @echo cd printing >printing.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>printing.bat - call printing.bat - @del printing.bat - @echo cd test >test.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>test.bat - call test.bat - @del test.bat - @echo cd virtual >virtual.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>virtual.bat - call virtual.bat - @del virtual.bat - @echo cd widget >widget.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>widget.bat - call widget.bat - @del widget.bat - @echo cd zip >zip.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>zip.bat - call zip.bat - @del zip.bat - -about: - @echo cd about >about.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>about.bat - call about.bat - @del about.bat - -help: - @echo cd help >help.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>help.bat - call help.bat - @del help.bat - -helpview: - @echo cd helpview >helpview.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>helpview.bat - call helpview.bat - @del helpview.bat - -printing: - @echo cd printing >printing.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>printing.bat - call printing.bat - @del printing.bat - -test: - @echo cd test >test.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>test.bat - call test.bat - @del test.bat - -virtual: - @echo cd virtual >virtual.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>virtual.bat - call virtual.bat - @del virtual.bat - -widget: - @echo cd widget >widget.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>widget.bat - call widget.bat - @del widget.bat - -zip: - @echo cd zip >zip.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>zip.bat - call zip.bat - @del zip.bat - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +.autodepend + +!ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../build/msw/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ + -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \ + -DCPP="$(CPP)" -DSHARED="$(SHARED)" -DWXUNIV="$(WXUNIV)" \ + -DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" -DBUILD="$(BUILD)" \ + -DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \ + -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \ + -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \ + -DUSE_AUI="$(USE_AUI)" -DUSE_RIBBON="$(USE_RIBBON)" \ + -DUSE_PROPGRID="$(USE_PROPGRID)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \ + -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \ + -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \ + -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \ + -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \ + -DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \ + -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \ + -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" + +### Conditionally set variables: ### + + + +### Targets: ### + +all: about help helpview printing test virtual widget zip + +clean: + -if exist .\*.obj del .\*.obj + -if exist .\*.res del .\*.res + -if exist .\*.csm del .\*.csm + @echo cd about >about.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>about.bat + call about.bat + @del about.bat + @echo cd help >help.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>help.bat + call help.bat + @del help.bat + @echo cd helpview >helpview.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>helpview.bat + call helpview.bat + @del helpview.bat + @echo cd printing >printing.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>printing.bat + call printing.bat + @del printing.bat + @echo cd test >test.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>test.bat + call test.bat + @del test.bat + @echo cd virtual >virtual.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>virtual.bat + call virtual.bat + @del virtual.bat + @echo cd widget >widget.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>widget.bat + call widget.bat + @del widget.bat + @echo cd zip >zip.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>zip.bat + call zip.bat + @del zip.bat + +about: + @echo cd about >about.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>about.bat + call about.bat + @del about.bat + +help: + @echo cd help >help.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>help.bat + call help.bat + @del help.bat + +helpview: + @echo cd helpview >helpview.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>helpview.bat + call helpview.bat + @del helpview.bat + +printing: + @echo cd printing >printing.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>printing.bat + call printing.bat + @del printing.bat + +test: + @echo cd test >test.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>test.bat + call test.bat + @del test.bat + +virtual: + @echo cd virtual >virtual.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>virtual.bat + call virtual.bat + @del virtual.bat + +widget: + @echo cd widget >widget.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>widget.bat + call widget.bat + @del widget.bat + +zip: + @echo cd zip >zip.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>zip.bat + call zip.bat + @del zip.bat + diff --git a/samples/html/makefile.gcc b/samples/html/makefile.gcc index 0db311a47f..5113d957f8 100644 --- a/samples/html/makefile.gcc +++ b/samples/html/makefile.gcc @@ -1,83 +1,83 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -include ../../build/msw/config.gcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ - LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \ - CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ - LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" WXUNIV="$(WXUNIV)" \ - UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \ - DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \ - MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ - USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \ - USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \ - USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \ - USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ - USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \ - USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \ - OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \ - WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ - CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ - RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)" - -### Conditionally set variables: ### - - - -### Targets: ### - -all: about help helpview printing test virtual widget zip - -clean: - -if exist .\*.o del .\*.o - -if exist .\*.d del .\*.d - $(MAKE) -C about -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C help -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C helpview -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C test -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C virtual -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C widget -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C zip -f makefile.gcc $(MAKEARGS) clean - -about: - $(MAKE) -C about -f makefile.gcc $(MAKEARGS) all - -help: - $(MAKE) -C help -f makefile.gcc $(MAKEARGS) all - -helpview: - $(MAKE) -C helpview -f makefile.gcc $(MAKEARGS) all - -printing: - $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) all - -test: - $(MAKE) -C test -f makefile.gcc $(MAKEARGS) all - -virtual: - $(MAKE) -C virtual -f makefile.gcc $(MAKEARGS) all - -widget: - $(MAKE) -C widget -f makefile.gcc $(MAKEARGS) all - -zip: - $(MAKE) -C zip -f makefile.gcc $(MAKEARGS) all - -.PHONY: all clean about help helpview printing test virtual widget zip - - -SHELL := $(COMSPEC) - -# Dependencies tracking: --include ./*.d +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../build/msw/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ + LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \ + CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ + LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" WXUNIV="$(WXUNIV)" \ + UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \ + DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \ + MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ + USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \ + USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \ + USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \ + USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ + USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \ + USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \ + OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \ + WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ + CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ + RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)" + +### Conditionally set variables: ### + + + +### Targets: ### + +all: about help helpview printing test virtual widget zip + +clean: + -if exist .\*.o del .\*.o + -if exist .\*.d del .\*.d + $(MAKE) -C about -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C help -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C helpview -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C test -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C virtual -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C widget -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C zip -f makefile.gcc $(MAKEARGS) clean + +about: + $(MAKE) -C about -f makefile.gcc $(MAKEARGS) all + +help: + $(MAKE) -C help -f makefile.gcc $(MAKEARGS) all + +helpview: + $(MAKE) -C helpview -f makefile.gcc $(MAKEARGS) all + +printing: + $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) all + +test: + $(MAKE) -C test -f makefile.gcc $(MAKEARGS) all + +virtual: + $(MAKE) -C virtual -f makefile.gcc $(MAKEARGS) all + +widget: + $(MAKE) -C widget -f makefile.gcc $(MAKEARGS) all + +zip: + $(MAKE) -C zip -f makefile.gcc $(MAKEARGS) all + +.PHONY: all clean about help helpview printing test virtual widget zip + + +SHELL := $(COMSPEC) + +# Dependencies tracking: +-include ./*.d diff --git a/samples/html/makefile.unx b/samples/html/makefile.unx index b2e181349d..77dc453e1c 100644 --- a/samples/html/makefile.unx +++ b/samples/html/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/makefile.vc b/samples/html/makefile.vc index 57c911403a..5bb56d4035 100644 --- a/samples/html/makefile.vc +++ b/samples/html/makefile.vc @@ -1,108 +1,108 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include <../../build/msw/config.vc> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ - CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \ - WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \ - TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \ - DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \ - MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ - USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \ - USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \ - USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \ - USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ - USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \ - USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \ - OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \ - WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ - CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ - RUNTIME_LIBS="$(RUNTIME_LIBS)" - -### Conditionally set variables: ### - - - -### Targets: ### - -all: sub_about sub_help sub_helpview sub_printing sub_test sub_virtual sub_widget sub_zip - -clean: - -if exist .\*.obj del .\*.obj - -if exist .\*.res del .\*.res - -if exist .\*.pch del .\*.pch - cd about - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd help - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd helpview - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd printing - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd test - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd virtual - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd widget - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd zip - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - -sub_about: - cd about - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_help: - cd help - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_helpview: - cd helpview - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_printing: - cd printing - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_test: - cd test - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_virtual: - cd virtual - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_widget: - cd widget - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_zip: - cd zip - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ + CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \ + WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \ + TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \ + DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \ + MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ + USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \ + USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \ + USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \ + USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ + USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \ + USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \ + OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \ + WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ + CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ + RUNTIME_LIBS="$(RUNTIME_LIBS)" + +### Conditionally set variables: ### + + + +### Targets: ### + +all: sub_about sub_help sub_helpview sub_printing sub_test sub_virtual sub_widget sub_zip + +clean: + -if exist .\*.obj del .\*.obj + -if exist .\*.res del .\*.res + -if exist .\*.pch del .\*.pch + cd about + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd help + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd helpview + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd printing + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd test + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd virtual + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd widget + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd zip + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + +sub_about: + cd about + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_help: + cd help + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_helpview: + cd helpview + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_printing: + cd printing + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_test: + cd test + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_virtual: + cd virtual + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_widget: + cd widget + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_zip: + cd zip + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + diff --git a/samples/html/makefile.wat b/samples/html/makefile.wat index b03440bdc4..daefa79286 100644 --- a/samples/html/makefile.wat +++ b/samples/html/makefile.wat @@ -1,128 +1,128 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - - -### Variables: ### - -MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & - CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" & - WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" & - DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" & - MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" & - USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" & - USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" & - USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" & - USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" & - USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" & - USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" & - OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" & - WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" & - CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" & - RUNTIME_LIBS="$(RUNTIME_LIBS)" - - -### Targets: ### - -all : .SYMBOLIC about help helpview printing test virtual widget zip - -clean : .SYMBOLIC - -if exist .\*.obj del .\*.obj - -if exist .\*.res del .\*.res - -if exist .\*.lbc del .\*.lbc - -if exist .\*.ilk del .\*.ilk - -if exist .\*.pch del .\*.pch - cd about - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd help - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd helpview - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd printing - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd test - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd virtual - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd widget - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd zip - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - -about : .SYMBOLIC - cd about - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -help : .SYMBOLIC - cd help - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -helpview : .SYMBOLIC - cd helpview - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -printing : .SYMBOLIC - cd printing - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -test : .SYMBOLIC - cd test - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -virtual : .SYMBOLIC - cd virtual - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -widget : .SYMBOLIC - cd widget - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -zip : .SYMBOLIC - cd zip - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + + +### Variables: ### + +MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & + CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" & + WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" & + DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" & + MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" & + USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" & + USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" & + USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" & + USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" & + USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" & + USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" & + OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" & + WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" & + CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" & + RUNTIME_LIBS="$(RUNTIME_LIBS)" + + +### Targets: ### + +all : .SYMBOLIC about help helpview printing test virtual widget zip + +clean : .SYMBOLIC + -if exist .\*.obj del .\*.obj + -if exist .\*.res del .\*.res + -if exist .\*.lbc del .\*.lbc + -if exist .\*.ilk del .\*.ilk + -if exist .\*.pch del .\*.pch + cd about + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd help + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd helpview + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd printing + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd test + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd virtual + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd widget + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd zip + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + +about : .SYMBOLIC + cd about + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +help : .SYMBOLIC + cd help + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +helpview : .SYMBOLIC + cd helpview + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +printing : .SYMBOLIC + cd printing + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +test : .SYMBOLIC + cd test + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +virtual : .SYMBOLIC + cd virtual + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +widget : .SYMBOLIC + cd widget + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +zip : .SYMBOLIC + cd zip + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + diff --git a/samples/html/printing/Makefile.in b/samples/html/printing/Makefile.in index c72947589d..ca3851a7dc 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.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/printing/makefile.bcc b/samples/html/printing/makefile.bcc index 867c5cc5a6..c7a6e11a2c 100644 --- a/samples/html/printing/makefile.bcc +++ b/samples/html/printing/makefile.bcc @@ -1,240 +1,240 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -.autodepend - -!ifndef BCCDIR -!ifndef MAKEDIR -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif -BCCDIR = $(MAKEDIR)\.. -!endif - -!include ../../../build/msw/config.bcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = bcc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -HTMLPRINTING_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \ - -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS) -HTMLPRINTING_OBJECTS = \ - $(OBJS)\htmlprinting_printing.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_2 = -Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_2 = -O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_5 = -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_5 = mt -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_6 = -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_6 = -tWM -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_7 = -tWR -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_7 = -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = i -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = -DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = -dwxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = -DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = -dwxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = -D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = -d_UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = -DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = -dWXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_HTML_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = -v -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = -v- -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO = -v- -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO = -v -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\htmlprinting.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.csm del $(OBJS)\*.csm - -if exist $(OBJS)\htmlprinting.exe del $(OBJS)\htmlprinting.exe - -if exist $(OBJS)\htmlprinting.tds del $(OBJS)\htmlprinting.tds - -if exist $(OBJS)\htmlprinting.ilc del $(OBJS)\htmlprinting.ilc - -if exist $(OBJS)\htmlprinting.ild del $(OBJS)\htmlprinting.ild - -if exist $(OBJS)\htmlprinting.ilf del $(OBJS)\htmlprinting.ilf - -if exist $(OBJS)\htmlprinting.ils del $(OBJS)\htmlprinting.ils - -$(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printing.res - ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| - c0w32.obj $(HTMLPRINTING_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\htmlprinting_printing.res -| - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (logo6.gif test.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\htmlprinting_printing.obj: .\printing.cpp - $(CXX) -q -c -P -o$@ $(HTMLPRINTING_CXXFLAGS) .\printing.cpp - -$(OBJS)\htmlprinting_printing.res: .\printing.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\printing.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +.autodepend + +!ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../../build/msw/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = bcc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +HTMLPRINTING_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \ + -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS) +HTMLPRINTING_OBJECTS = \ + $(OBJS)\htmlprinting_printing.obj + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_5 = +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_5 = mt +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_6 = +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_6 = -tWM +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_8 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_8 = +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = -DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = -dwxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = -DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = -dwxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -d_UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = -v +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\htmlprinting.exe data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.csm del $(OBJS)\*.csm + -if exist $(OBJS)\htmlprinting.exe del $(OBJS)\htmlprinting.exe + -if exist $(OBJS)\htmlprinting.tds del $(OBJS)\htmlprinting.tds + -if exist $(OBJS)\htmlprinting.ilc del $(OBJS)\htmlprinting.ilc + -if exist $(OBJS)\htmlprinting.ild del $(OBJS)\htmlprinting.ild + -if exist $(OBJS)\htmlprinting.ilf del $(OBJS)\htmlprinting.ilf + -if exist $(OBJS)\htmlprinting.ils del $(OBJS)\htmlprinting.ils + +$(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printing.res + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| + c0w32.obj $(HTMLPRINTING_OBJECTS),$@,, $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\htmlprinting_printing.res +| + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (logo6.gif test.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\htmlprinting_printing.obj: .\printing.cpp + $(CXX) -q -c -P -o$@ $(HTMLPRINTING_CXXFLAGS) .\printing.cpp + +$(OBJS)\htmlprinting_printing.res: .\printing.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\printing.rc + diff --git a/samples/html/printing/makefile.gcc b/samples/html/printing/makefile.gcc index 17ad9930ae..94df8f9d54 100644 --- a/samples/html/printing/makefile.gcc +++ b/samples/html/printing/makefile.gcc @@ -1,234 +1,234 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -include ../../../build/msw/config.gcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -CPPDEPS = -MT$@ -MF$@.d -MD -MP -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = gcc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -HTMLPRINTING_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \ - $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) -HTMLPRINTING_OBJECTS = \ - $(OBJS)\htmlprinting_printing.o \ - $(OBJS)\htmlprinting_printing_rc.o - -### Conditionally set variables: ### - -ifeq ($(GCC_VERSION),2.95) -GCCFLAGS = -fvtable-thunks -endif -ifeq ($(USE_GUI),0) -PORTNAME = base -endif -ifeq ($(USE_GUI),1) -PORTNAME = msw -endif -ifeq ($(BUILD),debug) -WXDEBUGFLAG = d -endif -ifeq ($(UNICODE),1) -WXUNICODEFLAG = u -endif -ifeq ($(WXUNIV),1) -WXUNIVNAME = univ -endif -ifeq ($(SHARED),1) -WXDLLFLAG = dll -endif -ifeq ($(SHARED),0) -LIBTYPE_SUFFIX = lib -endif -ifeq ($(SHARED),1) -LIBTYPE_SUFFIX = dll -endif -ifeq ($(MONOLITHIC),0) -EXTRALIBS_FOR_BASE = -endif -ifeq ($(MONOLITHIC),1) -EXTRALIBS_FOR_BASE = -endif -ifeq ($(BUILD),debug) -__OPTIMIZEFLAG_2 = -O0 -endif -ifeq ($(BUILD),release) -__OPTIMIZEFLAG_2 = -O2 -endif -ifeq ($(USE_RTTI),0) -__RTTIFLAG_5 = -fno-rtti -endif -ifeq ($(USE_RTTI),1) -__RTTIFLAG_5 = -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONSFLAG_6 = -fno-exceptions -endif -ifeq ($(USE_EXCEPTIONS),1) -__EXCEPTIONSFLAG_6 = -endif -ifeq ($(WXUNIV),1) -__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -endif -ifeq ($(WXUNIV),1) -__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ -endif -ifeq ($(DEBUG_FLAG),0) -__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -endif -ifeq ($(DEBUG_FLAG),0) -__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS -endif -ifeq ($(USE_RTTI),0) -__RTTI_DEFINE_p = -DwxNO_RTTI -endif -ifeq ($(USE_RTTI),0) -__RTTI_DEFINE_p_1 = --define wxNO_RTTI -endif -ifeq ($(USE_THREADS),0) -__THREAD_DEFINE_p = -DwxNO_THREADS -endif -ifeq ($(USE_THREADS),0) -__THREAD_DEFINE_p_1 = --define wxNO_THREADS -endif -ifeq ($(UNICODE),0) -__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 -endif -ifeq ($(UNICODE),1) -__UNICODE_DEFINE_p = -D_UNICODE -endif -ifeq ($(UNICODE),0) -__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0 -endif -ifeq ($(UNICODE),1) -__UNICODE_DEFINE_p_1 = --define _UNICODE -endif -ifeq ($(MSLU),1) -__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 -endif -ifeq ($(MSLU),1) -__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1 -endif -ifeq ($(USE_GDIPLUS),1) -__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1 -endif -ifeq ($(USE_GDIPLUS),1) -__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1 -endif -ifeq ($(SHARED),1) -__DLLFLAG_p = -DWXUSINGDLL -endif -ifeq ($(SHARED),1) -__DLLFLAG_p_1 = --define WXUSINGDLL -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_HTML_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_CORE_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_BASE_p = \ - -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -endif -ifeq ($(MONOLITHIC),1) -__WXLIB_MONO_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -endif -ifeq ($(USE_GUI),1) -__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -endif -ifeq ($(USE_GUI),1) -__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -endif -ifeq ($(USE_GUI),1) -__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -endif -ifeq ($(MSLU),1) -__UNICOWS_LIB_p = -lunicows -endif -ifeq ($(USE_GDIPLUS),1) -__GDIPLUS_LIB_p = -lgdiplus -endif -ifeq ($(BUILD),debug) -ifeq ($(DEBUG_INFO),default) -__DEBUGINFO = -g -endif -endif -ifeq ($(BUILD),release) -ifeq ($(DEBUG_INFO),default) -__DEBUGINFO = -endif -endif -ifeq ($(DEBUG_INFO),0) -__DEBUGINFO = -endif -ifeq ($(DEBUG_INFO),1) -__DEBUGINFO = -g -endif -ifeq ($(USE_THREADS),0) -__THREADSFLAG = -endif -ifeq ($(USE_THREADS),1) -__THREADSFLAG = -mthreads -endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\htmlprinting.exe data - -clean: - -if exist $(OBJS)\*.o del $(OBJS)\*.o - -if exist $(OBJS)\*.d del $(OBJS)\*.d - -if exist $(OBJS)\htmlprinting.exe del $(OBJS)\htmlprinting.exe - -$(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printing_rc.o - $(CXX) -o $@ $(HTMLPRINTING_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %%f in (logo6.gif test.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) - -$(OBJS)\htmlprinting_printing.o: ./printing.cpp - $(CXX) -c -o $@ $(HTMLPRINTING_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmlprinting_printing_rc.o: ./printing.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH - -.PHONY: all clean data - - -SHELL := $(COMSPEC) - -# Dependencies tracking: --include $(OBJS)/*.d +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../../build/msw/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +CPPDEPS = -MT$@ -MF$@.d -MD -MP +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = gcc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +HTMLPRINTING_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ + $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \ + $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \ + $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) +HTMLPRINTING_OBJECTS = \ + $(OBJS)\htmlprinting_printing.o \ + $(OBJS)\htmlprinting_printing_rc.o + +### Conditionally set variables: ### + +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif +ifeq ($(USE_GUI),0) +PORTNAME = base +endif +ifeq ($(USE_GUI),1) +PORTNAME = msw +endif +ifeq ($(BUILD),debug) +WXDEBUGFLAG = d +endif +ifeq ($(UNICODE),1) +WXUNICODEFLAG = u +endif +ifeq ($(WXUNIV),1) +WXUNIVNAME = univ +endif +ifeq ($(SHARED),1) +WXDLLFLAG = dll +endif +ifeq ($(SHARED),0) +LIBTYPE_SUFFIX = lib +endif +ifeq ($(SHARED),1) +LIBTYPE_SUFFIX = dll +endif +ifeq ($(MONOLITHIC),0) +EXTRALIBS_FOR_BASE = +endif +ifeq ($(MONOLITHIC),1) +EXTRALIBS_FOR_BASE = +endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif +ifeq ($(USE_RTTI),0) +__RTTIFLAG_5 = -fno-rtti +endif +ifeq ($(USE_RTTI),1) +__RTTIFLAG_5 = +endif +ifeq ($(USE_EXCEPTIONS),0) +__EXCEPTIONSFLAG_6 = -fno-exceptions +endif +ifeq ($(USE_EXCEPTIONS),1) +__EXCEPTIONSFLAG_6 = +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ +endif +ifeq ($(DEBUG_FLAG),0) +__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 +endif +ifeq ($(DEBUG_FLAG),0) +__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 +endif +ifeq ($(USE_EXCEPTIONS),0) +__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS +endif +ifeq ($(USE_EXCEPTIONS),0) +__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS +endif +ifeq ($(USE_RTTI),0) +__RTTI_DEFINE_p = -DwxNO_RTTI +endif +ifeq ($(USE_RTTI),0) +__RTTI_DEFINE_p_1 = --define wxNO_RTTI +endif +ifeq ($(USE_THREADS),0) +__THREAD_DEFINE_p = -DwxNO_THREADS +endif +ifeq ($(USE_THREADS),0) +__THREAD_DEFINE_p_1 = --define wxNO_THREADS +endif +ifeq ($(UNICODE),0) +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -D_UNICODE +endif +ifeq ($(UNICODE),0) +__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p_1 = --define _UNICODE +endif +ifeq ($(MSLU),1) +__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 +endif +ifeq ($(MSLU),1) +__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1 +endif +ifeq ($(USE_GDIPLUS),1) +__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1 +endif +ifeq ($(USE_GDIPLUS),1) +__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1 +endif +ifeq ($(SHARED),1) +__DLLFLAG_p = -DWXUSINGDLL +endif +ifeq ($(SHARED),1) +__DLLFLAG_p_1 = --define WXUSINGDLL +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_HTML_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = \ + -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) +endif +ifeq ($(MONOLITHIC),1) +__WXLIB_MONO_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) +endif +ifeq ($(USE_GUI),1) +__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +endif +ifeq ($(MSLU),1) +__UNICOWS_LIB_p = -lunicows +endif +ifeq ($(USE_GDIPLUS),1) +__GDIPLUS_LIB_p = -lgdiplus +endif +ifeq ($(BUILD),debug) +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = -g +endif +endif +ifeq ($(BUILD),release) +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = +endif +endif +ifeq ($(DEBUG_INFO),0) +__DEBUGINFO = +endif +ifeq ($(DEBUG_INFO),1) +__DEBUGINFO = -g +endif +ifeq ($(USE_THREADS),0) +__THREADSFLAG = +endif +ifeq ($(USE_THREADS),1) +__THREADSFLAG = -mthreads +endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\htmlprinting.exe data + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -if exist $(OBJS)\*.d del $(OBJS)\*.d + -if exist $(OBJS)\htmlprinting.exe del $(OBJS)\htmlprinting.exe + +$(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printing_rc.o + $(CXX) -o $@ $(HTMLPRINTING_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %%f in (logo6.gif test.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) + +$(OBJS)\htmlprinting_printing.o: ./printing.cpp + $(CXX) -c -o $@ $(HTMLPRINTING_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\htmlprinting_printing_rc.o: ./printing.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH + +.PHONY: all clean data + + +SHELL := $(COMSPEC) + +# Dependencies tracking: +-include $(OBJS)/*.d diff --git a/samples/html/printing/makefile.unx b/samples/html/printing/makefile.unx index ebfeac9597..5d7df30a98 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.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/html/printing/makefile.vc b/samples/html/printing/makefile.vc index 6b2d0e94ad..6be603836f 100644 --- a/samples/html/printing/makefile.vc +++ b/samples/html/printing/makefile.vc @@ -1,319 +1,344 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include <../../../build/msw/config.vc> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -HTMLPRINTING_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\htmlprinting.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ - $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_9) \ - $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS) -HTMLPRINTING_OBJECTS = \ - $(OBJS)\htmlprinting_printing.obj \ - $(OBJS)\htmlprinting_printing.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_HTML_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\htmlprinting.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\htmlprinting.exe del $(OBJS)\htmlprinting.exe - -if exist $(OBJS)\htmlprinting.ilk del $(OBJS)\htmlprinting.ilk - -if exist $(OBJS)\htmlprinting.pdb del $(OBJS)\htmlprinting.pdb - -$(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printing.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\htmlprinting.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(HTMLPRINTING_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (logo6.gif test.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\htmlprinting_printing.obj: .\printing.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLPRINTING_CXXFLAGS) .\printing.cpp - -$(OBJS)\htmlprinting_printing.res: .\printing.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\printing.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +HTMLPRINTING_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\htmlprinting.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \ + $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +HTMLPRINTING_OBJECTS = \ + $(OBJS)\htmlprinting_printing.obj +HTMLPRINTING_RESOURCES = \ + $(OBJS)\htmlprinting_printing.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\htmlprinting.exe data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\htmlprinting.exe del $(OBJS)\htmlprinting.exe + -if exist $(OBJS)\htmlprinting.ilk del $(OBJS)\htmlprinting.ilk + -if exist $(OBJS)\htmlprinting.pdb del $(OBJS)\htmlprinting.pdb + +$(OBJS)\htmlprinting.exe: $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printing.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\htmlprinting.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(HTMLPRINTING_OBJECTS) $(HTMLPRINTING_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (logo6.gif test.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\htmlprinting_printing.obj: .\printing.cpp + $(CXX) /c /nologo /TP /Fo$@ $(HTMLPRINTING_CXXFLAGS) .\printing.cpp + +$(OBJS)\htmlprinting_printing.res: .\printing.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\printing.rc + diff --git a/samples/html/printing/makefile.wat b/samples/html/printing/makefile.wat index c44b7eb97e..a80b391fe6 100644 --- a/samples/html/printing/makefile.wat +++ b/samples/html/printing/makefile.wat @@ -1,269 +1,269 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -HTMLPRINTING_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) & - $(__THREADSFLAG_5) $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) & - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & - $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) -HTMLPRINTING_OBJECTS = & - $(OBJS)\htmlprinting_printing.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\htmlprinting.exe data - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\htmlprinting.exe del $(OBJS)\htmlprinting.exe - -$(OBJS)\htmlprinting.exe : $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printing.res - @%create $(OBJS)\htmlprinting.lbc - @%append $(OBJS)\htmlprinting.lbc option quiet - @%append $(OBJS)\htmlprinting.lbc name $^@ - @%append $(OBJS)\htmlprinting.lbc option caseexact - @%append $(OBJS)\htmlprinting.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(HTMLPRINTING_OBJECTS)) do @%append $(OBJS)\htmlprinting.lbc file %i - @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\htmlprinting.lbc library %i - @%append $(OBJS)\htmlprinting.lbc option resource=$(OBJS)\htmlprinting_printing.res - @for %i in () do @%append $(OBJS)\htmlprinting.lbc option stack=%i - wlink @$(OBJS)\htmlprinting.lbc - -data : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (logo6.gif test.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\htmlprinting_printing.obj : .AUTODEPEND .\printing.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLPRINTING_CXXFLAGS) $< - -$(OBJS)\htmlprinting_printing.res : .AUTODEPEND .\printing.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +HTMLPRINTING_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) & + $(__THREADSFLAG_5) $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) & + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & + -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & + $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) +HTMLPRINTING_OBJECTS = & + $(OBJS)\htmlprinting_printing.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\htmlprinting.exe data + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\htmlprinting.exe del $(OBJS)\htmlprinting.exe + +$(OBJS)\htmlprinting.exe : $(HTMLPRINTING_OBJECTS) $(OBJS)\htmlprinting_printing.res + @%create $(OBJS)\htmlprinting.lbc + @%append $(OBJS)\htmlprinting.lbc option quiet + @%append $(OBJS)\htmlprinting.lbc name $^@ + @%append $(OBJS)\htmlprinting.lbc option caseexact + @%append $(OBJS)\htmlprinting.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(HTMLPRINTING_OBJECTS)) do @%append $(OBJS)\htmlprinting.lbc file %i + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\htmlprinting.lbc library %i + @%append $(OBJS)\htmlprinting.lbc option resource=$(OBJS)\htmlprinting_printing.res + @for %i in () do @%append $(OBJS)\htmlprinting.lbc option stack=%i + wlink @$(OBJS)\htmlprinting.lbc + +data : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (logo6.gif test.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\htmlprinting_printing.obj : .AUTODEPEND .\printing.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(HTMLPRINTING_CXXFLAGS) $< + +$(OBJS)\htmlprinting_printing.res : .AUTODEPEND .\printing.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + diff --git a/samples/html/printing/printing.dsp b/samples/html/printing/printing.dsp index 506858b0a9..4282389586 100644 --- a/samples/html/printing/printing.dsp +++ b/samples/html/printing/printing.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\htmlprinting" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\htmlprinting.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\htmlprinting.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\htmlprinting.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\htmlprinting.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\htmlprinting" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\htmlprinting.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\htmlprinting.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\htmlprinting.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\htmlprinting.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\htmlprinting" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\htmlprinting.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\htmlprinting.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\htmlprinting.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\htmlprinting.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\htmlprinting" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\htmlprinting.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\htmlprinting.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\htmlprinting.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\htmlprinting.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH diff --git a/samples/html/printing/printing_vc7.vcproj b/samples/html/printing/printing_vc7.vcproj index 90f2f7bcf6..07e0ab9be7 100644 --- a/samples/html/printing/printing_vc7.vcproj +++ b/samples/html/printing/printing_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\htmlprinting.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\htmlprinting.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\htmlprinting.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\htmlprinting.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\htmlprinting.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\htmlprinting.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\htmlprinting.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\htmlprinting.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\htmlprinting.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\htmlprinting.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\htmlprinting.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\htmlprinting.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\test.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ - $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_9) \ - $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS) -TEST_OBJECTS = \ - $(OBJS)\test_test.obj \ - $(OBJS)\test_test.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_HTML_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_NET_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\test.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\test.exe del $(OBJS)\test.exe - -if exist $(OBJS)\test.ilk del $(OBJS)\test.ilk - -if exist $(OBJS)\test.pdb del $(OBJS)\test.pdb - -$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_test.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\test.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(TEST_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (imagemap.png pic.png pic2.bmp i18n.gif imagemap.htm tables.htm test.htm listtest.htm 8859_2.htm cp1250.htm regres.htm foo.png subsup.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\test_test.obj: .\test.cpp - $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\test.cpp - -$(OBJS)\test_test.res: .\test.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\test.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\test.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \ + $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +TEST_OBJECTS = \ + $(OBJS)\test_test.obj +TEST_RESOURCES = \ + $(OBJS)\test_test.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_NET_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\test.exe data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\test.exe del $(OBJS)\test.exe + -if exist $(OBJS)\test.ilk del $(OBJS)\test.ilk + -if exist $(OBJS)\test.pdb del $(OBJS)\test.pdb + +$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_test.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\test.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(TEST_OBJECTS) $(TEST_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (imagemap.png pic.png pic2.bmp i18n.gif imagemap.htm tables.htm test.htm listtest.htm 8859_2.htm cp1250.htm regres.htm foo.png subsup.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\test_test.obj: .\test.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\test.cpp + +$(OBJS)\test_test.res: .\test.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\test.rc + diff --git a/samples/html/test/makefile.wat b/samples/html/test/makefile.wat index a70aae0f31..a75fdc7a7d 100644 --- a/samples/html/test/makefile.wat +++ b/samples/html/test/makefile.wat @@ -1,274 +1,274 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_NET_p = -!ifeq MONOLITHIC 0 -__WXLIB_NET_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & - $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) -TEST_OBJECTS = & - $(OBJS)\test_test.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\test.exe data - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\test.exe del $(OBJS)\test.exe - -$(OBJS)\test.exe : $(TEST_OBJECTS) $(OBJS)\test_test.res - @%create $(OBJS)\test.lbc - @%append $(OBJS)\test.lbc option quiet - @%append $(OBJS)\test.lbc name $^@ - @%append $(OBJS)\test.lbc option caseexact - @%append $(OBJS)\test.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(TEST_OBJECTS)) do @%append $(OBJS)\test.lbc file %i - @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\test.lbc library %i - @%append $(OBJS)\test.lbc option resource=$(OBJS)\test_test.res - @for %i in () do @%append $(OBJS)\test.lbc option stack=%i - wlink @$(OBJS)\test.lbc - -data : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (imagemap.png pic.png pic2.bmp i18n.gif imagemap.htm tables.htm test.htm listtest.htm 8859_2.htm cp1250.htm regres.htm foo.png subsup.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\test_test.obj : .AUTODEPEND .\test.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< - -$(OBJS)\test_test.res : .AUTODEPEND .\test.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_NET_p = +!ifeq MONOLITHIC 0 +__WXLIB_NET_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +TEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & + $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & + $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) +TEST_OBJECTS = & + $(OBJS)\test_test.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\test.exe data + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\test.exe del $(OBJS)\test.exe + +$(OBJS)\test.exe : $(TEST_OBJECTS) $(OBJS)\test_test.res + @%create $(OBJS)\test.lbc + @%append $(OBJS)\test.lbc option quiet + @%append $(OBJS)\test.lbc name $^@ + @%append $(OBJS)\test.lbc option caseexact + @%append $(OBJS)\test.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(TEST_OBJECTS)) do @%append $(OBJS)\test.lbc file %i + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\test.lbc library %i + @%append $(OBJS)\test.lbc option resource=$(OBJS)\test_test.res + @for %i in () do @%append $(OBJS)\test.lbc option stack=%i + wlink @$(OBJS)\test.lbc + +data : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (imagemap.png pic.png pic2.bmp i18n.gif imagemap.htm tables.htm test.htm listtest.htm 8859_2.htm cp1250.htm regres.htm foo.png subsup.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\test_test.obj : .AUTODEPEND .\test.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< + +$(OBJS)\test_test.res : .AUTODEPEND .\test.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + diff --git a/samples/html/test/test.dsp b/samples/html/test/test.dsp index f0785e0473..756581db68 100644 --- a/samples/html/test/test.dsp +++ b/samples/html/test/test.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\test" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\test.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\test.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\test" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\test" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\test.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\test.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\test" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\test.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\test.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH diff --git a/samples/html/test/test_vc7.vcproj b/samples/html/test/test_vc7.vcproj index 6f1d2117ce..c9dbd17899 100644 --- a/samples/html/test/test_vc7.vcproj +++ b/samples/html/test/test_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\test.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\test.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\test.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\test.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\test.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\test.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\test.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\test.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\test.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\test.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\test.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\test.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -VIRTUAL_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\virtual.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ - $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_9) \ - $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS) -VIRTUAL_OBJECTS = \ - $(OBJS)\virtual_virtual.obj \ - $(OBJS)\virtual_virtual.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_HTML_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\virtual.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\virtual.exe del $(OBJS)\virtual.exe - -if exist $(OBJS)\virtual.ilk del $(OBJS)\virtual.ilk - -if exist $(OBJS)\virtual.pdb del $(OBJS)\virtual.pdb - -$(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\virtual.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(VIRTUAL_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\virtual_virtual.obj: .\virtual.cpp - $(CXX) /c /nologo /TP /Fo$@ $(VIRTUAL_CXXFLAGS) .\virtual.cpp - -$(OBJS)\virtual_virtual.res: .\virtual.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\virtual.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +VIRTUAL_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\virtual.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \ + $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +VIRTUAL_OBJECTS = \ + $(OBJS)\virtual_virtual.obj +VIRTUAL_RESOURCES = \ + $(OBJS)\virtual_virtual.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\virtual.exe data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\virtual.exe del $(OBJS)\virtual.exe + -if exist $(OBJS)\virtual.ilk del $(OBJS)\virtual.ilk + -if exist $(OBJS)\virtual.pdb del $(OBJS)\virtual.pdb + +$(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\virtual.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(VIRTUAL_OBJECTS) $(VIRTUAL_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\virtual_virtual.obj: .\virtual.cpp + $(CXX) /c /nologo /TP /Fo$@ $(VIRTUAL_CXXFLAGS) .\virtual.cpp + +$(OBJS)\virtual_virtual.res: .\virtual.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\virtual.rc + diff --git a/samples/html/virtual/makefile.wat b/samples/html/virtual/makefile.wat index d9e726fb36..9ec39e6804 100644 --- a/samples/html/virtual/makefile.wat +++ b/samples/html/virtual/makefile.wat @@ -1,269 +1,269 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -VIRTUAL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & - $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) -VIRTUAL_OBJECTS = & - $(OBJS)\virtual_virtual.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\virtual.exe data - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\virtual.exe del $(OBJS)\virtual.exe - -$(OBJS)\virtual.exe : $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual.res - @%create $(OBJS)\virtual.lbc - @%append $(OBJS)\virtual.lbc option quiet - @%append $(OBJS)\virtual.lbc name $^@ - @%append $(OBJS)\virtual.lbc option caseexact - @%append $(OBJS)\virtual.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(VIRTUAL_OBJECTS)) do @%append $(OBJS)\virtual.lbc file %i - @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\virtual.lbc library %i - @%append $(OBJS)\virtual.lbc option resource=$(OBJS)\virtual_virtual.res - @for %i in () do @%append $(OBJS)\virtual.lbc option stack=%i - wlink @$(OBJS)\virtual.lbc - -data : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\virtual_virtual.obj : .AUTODEPEND .\virtual.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(VIRTUAL_CXXFLAGS) $< - -$(OBJS)\virtual_virtual.res : .AUTODEPEND .\virtual.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +VIRTUAL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & + $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & + $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) +VIRTUAL_OBJECTS = & + $(OBJS)\virtual_virtual.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\virtual.exe data + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\virtual.exe del $(OBJS)\virtual.exe + +$(OBJS)\virtual.exe : $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual.res + @%create $(OBJS)\virtual.lbc + @%append $(OBJS)\virtual.lbc option quiet + @%append $(OBJS)\virtual.lbc name $^@ + @%append $(OBJS)\virtual.lbc option caseexact + @%append $(OBJS)\virtual.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(VIRTUAL_OBJECTS)) do @%append $(OBJS)\virtual.lbc file %i + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\virtual.lbc library %i + @%append $(OBJS)\virtual.lbc option resource=$(OBJS)\virtual_virtual.res + @for %i in () do @%append $(OBJS)\virtual.lbc option stack=%i + wlink @$(OBJS)\virtual.lbc + +data : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\virtual_virtual.obj : .AUTODEPEND .\virtual.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(VIRTUAL_CXXFLAGS) $< + +$(OBJS)\virtual_virtual.res : .AUTODEPEND .\virtual.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + diff --git a/samples/html/virtual/virtual.dsp b/samples/html/virtual/virtual.dsp index 038f7345ee..4b856cf5fb 100644 --- a/samples/html/virtual/virtual.dsp +++ b/samples/html/virtual/virtual.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\virtual" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\virtual.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\virtual.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\virtual.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\virtual.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\virtual" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\virtual.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\virtual.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\virtual.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\virtual.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\virtual" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\virtual.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\virtual.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\virtual.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\virtual.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\virtual" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\virtual.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\virtual.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\virtual.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\virtual.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH diff --git a/samples/html/virtual/virtual_vc7.vcproj b/samples/html/virtual/virtual_vc7.vcproj index af36e2d12e..be90b5e1dc 100644 --- a/samples/html/virtual/virtual_vc7.vcproj +++ b/samples/html/virtual/virtual_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\virtual.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\virtual.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\virtual.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\virtual.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\virtual.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\virtual.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\virtual.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\virtual.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\virtual.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\virtual.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\virtual.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\virtual.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WIDGET_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\widget.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ - $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_9) \ - $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS) -WIDGET_OBJECTS = \ - $(OBJS)\widget_widget.obj \ - $(OBJS)\widget_widget.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_HTML_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\widget.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\widget.exe del $(OBJS)\widget.exe - -if exist $(OBJS)\widget.ilk del $(OBJS)\widget.ilk - -if exist $(OBJS)\widget.pdb del $(OBJS)\widget.pdb - -$(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_widget.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\widget.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(WIDGET_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\widget_widget.obj: .\widget.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIDGET_CXXFLAGS) .\widget.cpp - -$(OBJS)\widget_widget.res: .\widget.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\widget.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +WIDGET_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\widget.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \ + $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +WIDGET_OBJECTS = \ + $(OBJS)\widget_widget.obj +WIDGET_RESOURCES = \ + $(OBJS)\widget_widget.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\widget.exe data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\widget.exe del $(OBJS)\widget.exe + -if exist $(OBJS)\widget.ilk del $(OBJS)\widget.ilk + -if exist $(OBJS)\widget.pdb del $(OBJS)\widget.pdb + +$(OBJS)\widget.exe: $(WIDGET_OBJECTS) $(OBJS)\widget_widget.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\widget.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(WIDGET_OBJECTS) $(WIDGET_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\widget_widget.obj: .\widget.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGET_CXXFLAGS) .\widget.cpp + +$(OBJS)\widget_widget.res: .\widget.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\widget.rc + diff --git a/samples/html/widget/makefile.wat b/samples/html/widget/makefile.wat index 7a52d2c56f..c9cef980f1 100644 --- a/samples/html/widget/makefile.wat +++ b/samples/html/widget/makefile.wat @@ -1,269 +1,269 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WIDGET_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & - $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) -WIDGET_OBJECTS = & - $(OBJS)\widget_widget.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\widget.exe data - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\widget.exe del $(OBJS)\widget.exe - -$(OBJS)\widget.exe : $(WIDGET_OBJECTS) $(OBJS)\widget_widget.res - @%create $(OBJS)\widget.lbc - @%append $(OBJS)\widget.lbc option quiet - @%append $(OBJS)\widget.lbc name $^@ - @%append $(OBJS)\widget.lbc option caseexact - @%append $(OBJS)\widget.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(WIDGET_OBJECTS)) do @%append $(OBJS)\widget.lbc file %i - @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\widget.lbc library %i - @%append $(OBJS)\widget.lbc option resource=$(OBJS)\widget_widget.res - @for %i in () do @%append $(OBJS)\widget.lbc option stack=%i - wlink @$(OBJS)\widget.lbc - -data : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\widget_widget.obj : .AUTODEPEND .\widget.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGET_CXXFLAGS) $< - -$(OBJS)\widget_widget.res : .AUTODEPEND .\widget.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +WIDGET_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & + $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & + $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) +WIDGET_OBJECTS = & + $(OBJS)\widget_widget.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\widget.exe data + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\widget.exe del $(OBJS)\widget.exe + +$(OBJS)\widget.exe : $(WIDGET_OBJECTS) $(OBJS)\widget_widget.res + @%create $(OBJS)\widget.lbc + @%append $(OBJS)\widget.lbc option quiet + @%append $(OBJS)\widget.lbc name $^@ + @%append $(OBJS)\widget.lbc option caseexact + @%append $(OBJS)\widget.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(WIDGET_OBJECTS)) do @%append $(OBJS)\widget.lbc file %i + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\widget.lbc library %i + @%append $(OBJS)\widget.lbc option resource=$(OBJS)\widget_widget.res + @for %i in () do @%append $(OBJS)\widget.lbc option stack=%i + wlink @$(OBJS)\widget.lbc + +data : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\widget_widget.obj : .AUTODEPEND .\widget.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGET_CXXFLAGS) $< + +$(OBJS)\widget_widget.res : .AUTODEPEND .\widget.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + diff --git a/samples/html/widget/widget.dsp b/samples/html/widget/widget.dsp index 01729c863c..afef0adaf3 100644 --- a/samples/html/widget/widget.dsp +++ b/samples/html/widget/widget.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\widget" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\widget.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\widget.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\widget.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\widget.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\widget" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\widget.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\widget.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\widget.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\widget.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\widget" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\widget.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\widget.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\widget.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\widget.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\widget" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\widget.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\widget.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\widget.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\widget.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH diff --git a/samples/html/widget/widget_vc7.vcproj b/samples/html/widget/widget_vc7.vcproj index fb6fd5c89a..640924eb9b 100644 --- a/samples/html/widget/widget_vc7.vcproj +++ b/samples/html/widget/widget_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\widget.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\widget.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\widget.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\widget.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\widget.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\widget.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\widget.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\widget.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\widget.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\widget.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\widget.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\widget.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -ZIP_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\zip.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ - $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_9) \ - $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS) -ZIP_OBJECTS = \ - $(OBJS)\zip_zip.obj \ - $(OBJS)\zip_zip.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_HTML_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\zip.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\zip.exe del $(OBJS)\zip.exe - -if exist $(OBJS)\zip.ilk del $(OBJS)\zip.ilk - -if exist $(OBJS)\zip.pdb del $(OBJS)\zip.pdb - -$(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_zip.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\zip.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(ZIP_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (pages.zip start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\zip_zip.obj: .\zip.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ZIP_CXXFLAGS) .\zip.cpp - -$(OBJS)\zip_zip.res: .\zip.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\zip.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +ZIP_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\zip.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \ + $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +ZIP_OBJECTS = \ + $(OBJS)\zip_zip.obj +ZIP_RESOURCES = \ + $(OBJS)\zip_zip.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\zip.exe data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\zip.exe del $(OBJS)\zip.exe + -if exist $(OBJS)\zip.ilk del $(OBJS)\zip.ilk + -if exist $(OBJS)\zip.pdb del $(OBJS)\zip.pdb + +$(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_zip.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\zip.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(ZIP_OBJECTS) $(ZIP_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (pages.zip start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\zip_zip.obj: .\zip.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ZIP_CXXFLAGS) .\zip.cpp + +$(OBJS)\zip_zip.res: .\zip.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\zip.rc + diff --git a/samples/html/zip/makefile.wat b/samples/html/zip/makefile.wat index 26f2a0d1a8..9fa693c496 100644 --- a/samples/html/zip/makefile.wat +++ b/samples/html/zip/makefile.wat @@ -1,269 +1,269 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -ZIP_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & - $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) -ZIP_OBJECTS = & - $(OBJS)\zip_zip.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\zip.exe data - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\zip.exe del $(OBJS)\zip.exe - -$(OBJS)\zip.exe : $(ZIP_OBJECTS) $(OBJS)\zip_zip.res - @%create $(OBJS)\zip.lbc - @%append $(OBJS)\zip.lbc option quiet - @%append $(OBJS)\zip.lbc name $^@ - @%append $(OBJS)\zip.lbc option caseexact - @%append $(OBJS)\zip.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(ZIP_OBJECTS)) do @%append $(OBJS)\zip.lbc file %i - @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\zip.lbc library %i - @%append $(OBJS)\zip.lbc option resource=$(OBJS)\zip_zip.res - @for %i in () do @%append $(OBJS)\zip.lbc option stack=%i - wlink @$(OBJS)\zip.lbc - -data : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (pages.zip start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\zip_zip.obj : .AUTODEPEND .\zip.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ZIP_CXXFLAGS) $< - -$(OBJS)\zip_zip.res : .AUTODEPEND .\zip.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +ZIP_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & + $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & + $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) +ZIP_OBJECTS = & + $(OBJS)\zip_zip.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\zip.exe data + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\zip.exe del $(OBJS)\zip.exe + +$(OBJS)\zip.exe : $(ZIP_OBJECTS) $(OBJS)\zip_zip.res + @%create $(OBJS)\zip.lbc + @%append $(OBJS)\zip.lbc option quiet + @%append $(OBJS)\zip.lbc name $^@ + @%append $(OBJS)\zip.lbc option caseexact + @%append $(OBJS)\zip.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(ZIP_OBJECTS)) do @%append $(OBJS)\zip.lbc file %i + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\zip.lbc library %i + @%append $(OBJS)\zip.lbc option resource=$(OBJS)\zip_zip.res + @for %i in () do @%append $(OBJS)\zip.lbc option stack=%i + wlink @$(OBJS)\zip.lbc + +data : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (pages.zip start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\zip_zip.obj : .AUTODEPEND .\zip.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ZIP_CXXFLAGS) $< + +$(OBJS)\zip_zip.res : .AUTODEPEND .\zip.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + diff --git a/samples/html/zip/zip.dsp b/samples/html/zip/zip.dsp index f92702d23c..7a402bb261 100644 --- a/samples/html/zip/zip.dsp +++ b/samples/html/zip/zip.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\zip" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\zip.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\zip.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\zip.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\zip.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\zip" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\zip.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\zip.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\zip.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\zip.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\zip" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\zip.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\zip.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\zip.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\zip.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\zip" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\zip.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\zip.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\zip.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\zip.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH diff --git a/samples/html/zip/zip_vc7.vcproj b/samples/html/zip/zip_vc7.vcproj index 9d7db8183a..cd0d6d0af3 100644 --- a/samples/html/zip/zip_vc7.vcproj +++ b/samples/html/zip/zip_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\zip.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\zip.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\zip.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\zip.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\zip.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\zip.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\zip.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\zip.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\zip.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\zip.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\zip.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\zip.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\image.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\image.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\image.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\image.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\image.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\image.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\image.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\image.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\image.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\image.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\image.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\image.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -IMAGE_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\image.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -IMAGE_OBJECTS = \ - $(OBJS)\image_image.obj \ - $(OBJS)\image_canvas.obj \ - $(OBJS)\image_image.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\image.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\image.exe del $(OBJS)\image.exe - -if exist $(OBJS)\image.ilk del $(OBJS)\image.ilk - -if exist $(OBJS)\image.pdb del $(OBJS)\image.pdb - -$(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_image.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\image.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(IMAGE_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\image_image.obj: .\image.cpp - $(CXX) /c /nologo /TP /Fo$@ $(IMAGE_CXXFLAGS) .\image.cpp - -$(OBJS)\image_canvas.obj: .\canvas.cpp - $(CXX) /c /nologo /TP /Fo$@ $(IMAGE_CXXFLAGS) .\canvas.cpp - -$(OBJS)\image_image.res: .\image.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\image.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +IMAGE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\image.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +IMAGE_OBJECTS = \ + $(OBJS)\image_image.obj \ + $(OBJS)\image_canvas.obj +IMAGE_RESOURCES = \ + $(OBJS)\image_image.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\image.exe data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\image.exe del $(OBJS)\image.exe + -if exist $(OBJS)\image.ilk del $(OBJS)\image.ilk + -if exist $(OBJS)\image.pdb del $(OBJS)\image.pdb + +$(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_image.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\image.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(IMAGE_OBJECTS) $(IMAGE_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\image_image.obj: .\image.cpp + $(CXX) /c /nologo /TP /Fo$@ $(IMAGE_CXXFLAGS) .\image.cpp + +$(OBJS)\image_canvas.obj: .\canvas.cpp + $(CXX) /c /nologo /TP /Fo$@ $(IMAGE_CXXFLAGS) .\canvas.cpp + +$(OBJS)\image_image.res: .\image.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\image.rc + diff --git a/samples/image/makefile.wat b/samples/image/makefile.wat index 241a607fa2..ba9b3fb7ab 100644 --- a/samples/image/makefile.wat +++ b/samples/image/makefile.wat @@ -1,268 +1,268 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -IMAGE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -IMAGE_OBJECTS = & - $(OBJS)\image_image.obj & - $(OBJS)\image_canvas.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\image.exe data - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\image.exe del $(OBJS)\image.exe - -$(OBJS)\image.exe : $(IMAGE_OBJECTS) $(OBJS)\image_image.res - @%create $(OBJS)\image.lbc - @%append $(OBJS)\image.lbc option quiet - @%append $(OBJS)\image.lbc name $^@ - @%append $(OBJS)\image.lbc option caseexact - @%append $(OBJS)\image.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(IMAGE_OBJECTS)) do @%append $(OBJS)\image.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\image.lbc library %i - @%append $(OBJS)\image.lbc option resource=$(OBJS)\image_image.res - @for %i in () do @%append $(OBJS)\image.lbc option stack=%i - wlink @$(OBJS)\image.lbc - -data : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\image_image.obj : .AUTODEPEND .\image.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(IMAGE_CXXFLAGS) $< - -$(OBJS)\image_canvas.obj : .AUTODEPEND .\canvas.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(IMAGE_CXXFLAGS) $< - -$(OBJS)\image_image.res : .AUTODEPEND .\image.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +IMAGE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +IMAGE_OBJECTS = & + $(OBJS)\image_image.obj & + $(OBJS)\image_canvas.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\image.exe data + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\image.exe del $(OBJS)\image.exe + +$(OBJS)\image.exe : $(IMAGE_OBJECTS) $(OBJS)\image_image.res + @%create $(OBJS)\image.lbc + @%append $(OBJS)\image.lbc option quiet + @%append $(OBJS)\image.lbc name $^@ + @%append $(OBJS)\image.lbc option caseexact + @%append $(OBJS)\image.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(IMAGE_OBJECTS)) do @%append $(OBJS)\image.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\image.lbc library %i + @%append $(OBJS)\image.lbc option resource=$(OBJS)\image_image.res + @for %i in () do @%append $(OBJS)\image.lbc option stack=%i + wlink @$(OBJS)\image.lbc + +data : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\image_image.obj : .AUTODEPEND .\image.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(IMAGE_CXXFLAGS) $< + +$(OBJS)\image_canvas.obj : .AUTODEPEND .\canvas.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(IMAGE_CXXFLAGS) $< + +$(OBJS)\image_image.res : .AUTODEPEND .\image.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/internat/Makefile.in b/samples/internat/Makefile.in index b21abe5d0d..b4b9b70fcf 100644 --- a/samples/internat/Makefile.in +++ b/samples/internat/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/internat/internat.dsp b/samples/internat/internat.dsp index 9fec7d3c38..cb7f236296 100644 --- a/samples/internat/internat.dsp +++ b/samples/internat/internat.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\internat" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\internat.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\internat.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\internat.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\internat.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\internat" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\internat.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\internat.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\internat.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\internat.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\internat" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\internat.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\internat.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\internat.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\internat.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\internat" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\internat.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\internat.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\internat.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\internat.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/internat/internat_vc7.vcproj b/samples/internat/internat_vc7.vcproj index fa2ee2e0b3..04505c8534 100644 --- a/samples/internat/internat_vc7.vcproj +++ b/samples/internat/internat_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\internat.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\internat.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\internat.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\internat.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\internat.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\internat.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\internat.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\internat.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\internat.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\internat.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\internat.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\internat.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -INTERNAT_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\internat.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -INTERNAT_OBJECTS = \ - $(OBJS)\internat_internat.obj \ - $(OBJS)\internat_internat.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\internat.exe ar bg cs de fr it ka pl ru sv ja ja_JP.EUC-JP - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\internat.exe del $(OBJS)\internat.exe - -if exist $(OBJS)\internat.ilk del $(OBJS)\internat.ilk - -if exist $(OBJS)\internat.pdb del $(OBJS)\internat.pdb - -$(OBJS)\internat.exe: $(INTERNAT_OBJECTS) $(OBJS)\internat_internat.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\internat.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(INTERNAT_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -ar: - if not exist $(OBJS)\ar mkdir $(OBJS)\ar - for %f in (internat.po internat.mo) do if not exist $(OBJS)\ar\%f copy .\ar\%f $(OBJS)\ar - -bg: - if not exist $(OBJS)\bg mkdir $(OBJS)\bg - for %f in (internat.po internat.mo) do if not exist $(OBJS)\bg\%f copy .\bg\%f $(OBJS)\bg - -cs: - if not exist $(OBJS)\cs mkdir $(OBJS)\cs - for %f in (internat.po internat.mo) do if not exist $(OBJS)\cs\%f copy .\cs\%f $(OBJS)\cs - -de: - if not exist $(OBJS)\de mkdir $(OBJS)\de - for %f in (internat.po internat.mo) do if not exist $(OBJS)\de\%f copy .\de\%f $(OBJS)\de - -fr: - if not exist $(OBJS)\fr mkdir $(OBJS)\fr - for %f in (internat.po internat.mo) do if not exist $(OBJS)\fr\%f copy .\fr\%f $(OBJS)\fr - -it: - if not exist $(OBJS)\it mkdir $(OBJS)\it - for %f in (internat.po internat.mo) do if not exist $(OBJS)\it\%f copy .\it\%f $(OBJS)\it - -ka: - if not exist $(OBJS)\ka mkdir $(OBJS)\ka - for %f in (internat.po internat.mo) do if not exist $(OBJS)\ka\%f copy .\ka\%f $(OBJS)\ka - -pl: - if not exist $(OBJS)\pl mkdir $(OBJS)\pl - for %f in (internat.po internat.mo) do if not exist $(OBJS)\pl\%f copy .\pl\%f $(OBJS)\pl - -ru: - if not exist $(OBJS)\ru mkdir $(OBJS)\ru - for %f in (internat.po internat.mo) do if not exist $(OBJS)\ru\%f copy .\ru\%f $(OBJS)\ru - -sv: - if not exist $(OBJS)\sv mkdir $(OBJS)\sv - for %f in (internat.po internat.mo) do if not exist $(OBJS)\sv\%f copy .\sv\%f $(OBJS)\sv - -ja: - if not exist $(OBJS)\ja mkdir $(OBJS)\ja - for %f in (internat.po internat.mo) do if not exist $(OBJS)\ja\%f copy .\ja\%f $(OBJS)\ja - -ja_JP.EUC-JP: - if not exist $(OBJS)\ja_JP.EUC-JP mkdir $(OBJS)\ja_JP.EUC-JP - for %f in (internat.po internat.mo) do if not exist $(OBJS)\ja_JP.EUC-JP\%f copy .\ja_JP.EUC-JP\%f $(OBJS)\ja_JP.EUC-JP - -$(OBJS)\internat_internat.obj: .\internat.cpp - $(CXX) /c /nologo /TP /Fo$@ $(INTERNAT_CXXFLAGS) .\internat.cpp - -$(OBJS)\internat_internat.res: .\internat.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\internat.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +INTERNAT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\internat.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +INTERNAT_OBJECTS = \ + $(OBJS)\internat_internat.obj +INTERNAT_RESOURCES = \ + $(OBJS)\internat_internat.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\internat.exe ar bg cs de fr it ka pl ru sv ja ja_JP.EUC-JP + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\internat.exe del $(OBJS)\internat.exe + -if exist $(OBJS)\internat.ilk del $(OBJS)\internat.ilk + -if exist $(OBJS)\internat.pdb del $(OBJS)\internat.pdb + +$(OBJS)\internat.exe: $(INTERNAT_OBJECTS) $(OBJS)\internat_internat.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\internat.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(INTERNAT_OBJECTS) $(INTERNAT_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +ar: + if not exist $(OBJS)\ar mkdir $(OBJS)\ar + for %f in (internat.po internat.mo) do if not exist $(OBJS)\ar\%f copy .\ar\%f $(OBJS)\ar + +bg: + if not exist $(OBJS)\bg mkdir $(OBJS)\bg + for %f in (internat.po internat.mo) do if not exist $(OBJS)\bg\%f copy .\bg\%f $(OBJS)\bg + +cs: + if not exist $(OBJS)\cs mkdir $(OBJS)\cs + for %f in (internat.po internat.mo) do if not exist $(OBJS)\cs\%f copy .\cs\%f $(OBJS)\cs + +de: + if not exist $(OBJS)\de mkdir $(OBJS)\de + for %f in (internat.po internat.mo) do if not exist $(OBJS)\de\%f copy .\de\%f $(OBJS)\de + +fr: + if not exist $(OBJS)\fr mkdir $(OBJS)\fr + for %f in (internat.po internat.mo) do if not exist $(OBJS)\fr\%f copy .\fr\%f $(OBJS)\fr + +it: + if not exist $(OBJS)\it mkdir $(OBJS)\it + for %f in (internat.po internat.mo) do if not exist $(OBJS)\it\%f copy .\it\%f $(OBJS)\it + +ka: + if not exist $(OBJS)\ka mkdir $(OBJS)\ka + for %f in (internat.po internat.mo) do if not exist $(OBJS)\ka\%f copy .\ka\%f $(OBJS)\ka + +pl: + if not exist $(OBJS)\pl mkdir $(OBJS)\pl + for %f in (internat.po internat.mo) do if not exist $(OBJS)\pl\%f copy .\pl\%f $(OBJS)\pl + +ru: + if not exist $(OBJS)\ru mkdir $(OBJS)\ru + for %f in (internat.po internat.mo) do if not exist $(OBJS)\ru\%f copy .\ru\%f $(OBJS)\ru + +sv: + if not exist $(OBJS)\sv mkdir $(OBJS)\sv + for %f in (internat.po internat.mo) do if not exist $(OBJS)\sv\%f copy .\sv\%f $(OBJS)\sv + +ja: + if not exist $(OBJS)\ja mkdir $(OBJS)\ja + for %f in (internat.po internat.mo) do if not exist $(OBJS)\ja\%f copy .\ja\%f $(OBJS)\ja + +ja_JP.EUC-JP: + if not exist $(OBJS)\ja_JP.EUC-JP mkdir $(OBJS)\ja_JP.EUC-JP + for %f in (internat.po internat.mo) do if not exist $(OBJS)\ja_JP.EUC-JP\%f copy .\ja_JP.EUC-JP\%f $(OBJS)\ja_JP.EUC-JP + +$(OBJS)\internat_internat.obj: .\internat.cpp + $(CXX) /c /nologo /TP /Fo$@ $(INTERNAT_CXXFLAGS) .\internat.cpp + +$(OBJS)\internat_internat.res: .\internat.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\internat.rc + diff --git a/samples/internat/makefile.wat b/samples/internat/makefile.wat index 78eb744a95..30cd81225d 100644 --- a/samples/internat/makefile.wat +++ b/samples/internat/makefile.wat @@ -1,308 +1,308 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -INTERNAT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -INTERNAT_OBJECTS = & - $(OBJS)\internat_internat.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\internat.exe ar bg cs de fr it ka pl ru sv ja ja_JP.EUC-JP - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\internat.exe del $(OBJS)\internat.exe - -$(OBJS)\internat.exe : $(INTERNAT_OBJECTS) $(OBJS)\internat_internat.res - @%create $(OBJS)\internat.lbc - @%append $(OBJS)\internat.lbc option quiet - @%append $(OBJS)\internat.lbc name $^@ - @%append $(OBJS)\internat.lbc option caseexact - @%append $(OBJS)\internat.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(INTERNAT_OBJECTS)) do @%append $(OBJS)\internat.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\internat.lbc library %i - @%append $(OBJS)\internat.lbc option resource=$(OBJS)\internat_internat.res - @for %i in () do @%append $(OBJS)\internat.lbc option stack=%i - wlink @$(OBJS)\internat.lbc - -ar : .SYMBOLIC - if not exist $(OBJS)\ar mkdir $(OBJS)\ar - for %f in (internat.po internat.mo) do if not exist $(OBJS)\ar\%f copy .\ar\%f $(OBJS)\ar - -bg : .SYMBOLIC - if not exist $(OBJS)\bg mkdir $(OBJS)\bg - for %f in (internat.po internat.mo) do if not exist $(OBJS)\bg\%f copy .\bg\%f $(OBJS)\bg - -cs : .SYMBOLIC - if not exist $(OBJS)\cs mkdir $(OBJS)\cs - for %f in (internat.po internat.mo) do if not exist $(OBJS)\cs\%f copy .\cs\%f $(OBJS)\cs - -de : .SYMBOLIC - if not exist $(OBJS)\de mkdir $(OBJS)\de - for %f in (internat.po internat.mo) do if not exist $(OBJS)\de\%f copy .\de\%f $(OBJS)\de - -fr : .SYMBOLIC - if not exist $(OBJS)\fr mkdir $(OBJS)\fr - for %f in (internat.po internat.mo) do if not exist $(OBJS)\fr\%f copy .\fr\%f $(OBJS)\fr - -it : .SYMBOLIC - if not exist $(OBJS)\it mkdir $(OBJS)\it - for %f in (internat.po internat.mo) do if not exist $(OBJS)\it\%f copy .\it\%f $(OBJS)\it - -ka : .SYMBOLIC - if not exist $(OBJS)\ka mkdir $(OBJS)\ka - for %f in (internat.po internat.mo) do if not exist $(OBJS)\ka\%f copy .\ka\%f $(OBJS)\ka - -pl : .SYMBOLIC - if not exist $(OBJS)\pl mkdir $(OBJS)\pl - for %f in (internat.po internat.mo) do if not exist $(OBJS)\pl\%f copy .\pl\%f $(OBJS)\pl - -ru : .SYMBOLIC - if not exist $(OBJS)\ru mkdir $(OBJS)\ru - for %f in (internat.po internat.mo) do if not exist $(OBJS)\ru\%f copy .\ru\%f $(OBJS)\ru - -sv : .SYMBOLIC - if not exist $(OBJS)\sv mkdir $(OBJS)\sv - for %f in (internat.po internat.mo) do if not exist $(OBJS)\sv\%f copy .\sv\%f $(OBJS)\sv - -ja : .SYMBOLIC - if not exist $(OBJS)\ja mkdir $(OBJS)\ja - for %f in (internat.po internat.mo) do if not exist $(OBJS)\ja\%f copy .\ja\%f $(OBJS)\ja - -ja_JP.EUC-JP : .SYMBOLIC - if not exist $(OBJS)\ja_JP.EUC-JP mkdir $(OBJS)\ja_JP.EUC-JP - for %f in (internat.po internat.mo) do if not exist $(OBJS)\ja_JP.EUC-JP\%f copy .\ja_JP.EUC-JP\%f $(OBJS)\ja_JP.EUC-JP - -$(OBJS)\internat_internat.obj : .AUTODEPEND .\internat.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(INTERNAT_CXXFLAGS) $< - -$(OBJS)\internat_internat.res : .AUTODEPEND .\internat.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +INTERNAT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +INTERNAT_OBJECTS = & + $(OBJS)\internat_internat.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\internat.exe ar bg cs de fr it ka pl ru sv ja ja_JP.EUC-JP + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\internat.exe del $(OBJS)\internat.exe + +$(OBJS)\internat.exe : $(INTERNAT_OBJECTS) $(OBJS)\internat_internat.res + @%create $(OBJS)\internat.lbc + @%append $(OBJS)\internat.lbc option quiet + @%append $(OBJS)\internat.lbc name $^@ + @%append $(OBJS)\internat.lbc option caseexact + @%append $(OBJS)\internat.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(INTERNAT_OBJECTS)) do @%append $(OBJS)\internat.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\internat.lbc library %i + @%append $(OBJS)\internat.lbc option resource=$(OBJS)\internat_internat.res + @for %i in () do @%append $(OBJS)\internat.lbc option stack=%i + wlink @$(OBJS)\internat.lbc + +ar : .SYMBOLIC + if not exist $(OBJS)\ar mkdir $(OBJS)\ar + for %f in (internat.po internat.mo) do if not exist $(OBJS)\ar\%f copy .\ar\%f $(OBJS)\ar + +bg : .SYMBOLIC + if not exist $(OBJS)\bg mkdir $(OBJS)\bg + for %f in (internat.po internat.mo) do if not exist $(OBJS)\bg\%f copy .\bg\%f $(OBJS)\bg + +cs : .SYMBOLIC + if not exist $(OBJS)\cs mkdir $(OBJS)\cs + for %f in (internat.po internat.mo) do if not exist $(OBJS)\cs\%f copy .\cs\%f $(OBJS)\cs + +de : .SYMBOLIC + if not exist $(OBJS)\de mkdir $(OBJS)\de + for %f in (internat.po internat.mo) do if not exist $(OBJS)\de\%f copy .\de\%f $(OBJS)\de + +fr : .SYMBOLIC + if not exist $(OBJS)\fr mkdir $(OBJS)\fr + for %f in (internat.po internat.mo) do if not exist $(OBJS)\fr\%f copy .\fr\%f $(OBJS)\fr + +it : .SYMBOLIC + if not exist $(OBJS)\it mkdir $(OBJS)\it + for %f in (internat.po internat.mo) do if not exist $(OBJS)\it\%f copy .\it\%f $(OBJS)\it + +ka : .SYMBOLIC + if not exist $(OBJS)\ka mkdir $(OBJS)\ka + for %f in (internat.po internat.mo) do if not exist $(OBJS)\ka\%f copy .\ka\%f $(OBJS)\ka + +pl : .SYMBOLIC + if not exist $(OBJS)\pl mkdir $(OBJS)\pl + for %f in (internat.po internat.mo) do if not exist $(OBJS)\pl\%f copy .\pl\%f $(OBJS)\pl + +ru : .SYMBOLIC + if not exist $(OBJS)\ru mkdir $(OBJS)\ru + for %f in (internat.po internat.mo) do if not exist $(OBJS)\ru\%f copy .\ru\%f $(OBJS)\ru + +sv : .SYMBOLIC + if not exist $(OBJS)\sv mkdir $(OBJS)\sv + for %f in (internat.po internat.mo) do if not exist $(OBJS)\sv\%f copy .\sv\%f $(OBJS)\sv + +ja : .SYMBOLIC + if not exist $(OBJS)\ja mkdir $(OBJS)\ja + for %f in (internat.po internat.mo) do if not exist $(OBJS)\ja\%f copy .\ja\%f $(OBJS)\ja + +ja_JP.EUC-JP : .SYMBOLIC + if not exist $(OBJS)\ja_JP.EUC-JP mkdir $(OBJS)\ja_JP.EUC-JP + for %f in (internat.po internat.mo) do if not exist $(OBJS)\ja_JP.EUC-JP\%f copy .\ja_JP.EUC-JP\%f $(OBJS)\ja_JP.EUC-JP + +$(OBJS)\internat_internat.obj : .AUTODEPEND .\internat.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(INTERNAT_CXXFLAGS) $< + +$(OBJS)\internat_internat.res : .AUTODEPEND .\internat.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in index 8de9f7a7b8..70f5a594f4 100644 --- a/samples/ipc/Makefile.in +++ b/samples/ipc/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/ipc/ipc_baseipcclient.dsp b/samples/ipc/ipc_baseipcclient.dsp index 61e42d4fe2..9053e2fcf4 100644 --- a/samples/ipc/ipc_baseipcclient.dsp +++ b/samples/ipc/ipc_baseipcclient.dsp @@ -46,8 +46,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\baseipcclient" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe @@ -92,8 +92,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\baseipcclient" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe @@ -138,8 +138,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\baseipcclient" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe @@ -184,8 +184,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\baseipcclient" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe diff --git a/samples/ipc/ipc_baseipcserver.dsp b/samples/ipc/ipc_baseipcserver.dsp index 48c93b71bb..149d97a77a 100644 --- a/samples/ipc/ipc_baseipcserver.dsp +++ b/samples/ipc/ipc_baseipcserver.dsp @@ -46,8 +46,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\baseipcserver" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe @@ -92,8 +92,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\baseipcserver" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe @@ -138,8 +138,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\baseipcserver" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe @@ -184,8 +184,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\baseipcserver" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe diff --git a/samples/ipc/ipc_ipcclient.dsp b/samples/ipc/ipc_ipcclient.dsp index 2037d36608..a061879cbb 100644 --- a/samples/ipc/ipc_ipcclient.dsp +++ b/samples/ipc/ipc_ipcclient.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\ipcclient" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\ipcclient" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\ipcclient" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\ipcclient" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\ipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\ipcclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\ipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\ipcclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/ipc/ipc_ipcserver.dsp b/samples/ipc/ipc_ipcserver.dsp index 1bb9457cfb..03ea97bf56 100644 --- a/samples/ipc/ipc_ipcserver.dsp +++ b/samples/ipc/ipc_ipcserver.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\ipcserver" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\ipcserver" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\ipcserver" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\ipcserver" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\ipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\ipcserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\ipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\ipcserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/ipc/ipc_vc7_baseipcclient.vcproj b/samples/ipc/ipc_vc7_baseipcclient.vcproj index ded4c80109..adbe82eb2f 100644 --- a/samples/ipc/ipc_vc7_baseipcclient.vcproj +++ b/samples/ipc/ipc_vc7_baseipcclient.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\baseipcclient.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\baseipcclient.pdb" SubSystem="1" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\baseipcserver.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\baseipcserver.pdb" SubSystem="1" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\ipcclient.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\ipcclient.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\ipcserver.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\ipcserver.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\baseipcclient.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\baseipcclient.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\baseipcserver.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\baseipcserver.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\ipcclient.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\ipcclient.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\ipcserver.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\ipcserver.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\baseipcclient.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\baseipcclient.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\baseipcclient.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\baseipcclient.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\baseipcclient.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\baseipcclient.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\baseipcclient.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\baseipcclient.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\baseipcserver.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\baseipcserver.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\baseipcserver.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\baseipcserver.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\baseipcserver.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\baseipcserver.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\baseipcserver.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\baseipcserver.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\ipcclient.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\ipcclient.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\ipcclient.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\ipcclient.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\ipcclient.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\ipcclient.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\ipcclient.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\ipcclient.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\ipcserver.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\ipcserver.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\ipcserver.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\ipcserver.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\ipcserver.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\ipcserver.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\ipcserver.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\ipcserver.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -IPCCLIENT_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) /Fd$(OBJS)\ipcclient.pdb $(____DEBUGRUNTIME) \ - $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - $(CPPFLAGS) $(CXXFLAGS) -IPCCLIENT_OBJECTS = \ - $(OBJS)\ipcclient_sample.res \ - $(OBJS)\ipcclient_client.obj -IPCSERVER_CXXFLAGS = /M$(__RUNTIME_LIBS_22)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) /Fd$(OBJS)\ipcserver.pdb $(____DEBUGRUNTIME) \ - $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - $(CPPFLAGS) $(CXXFLAGS) -IPCSERVER_OBJECTS = \ - $(OBJS)\ipcserver_sample.res \ - $(OBJS)\ipcserver_server.obj -BASEIPCCLIENT_CXXFLAGS = /M$(__RUNTIME_LIBS_36)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) /Fd$(OBJS)\baseipcclient.pdb $(____DEBUGRUNTIME) \ - $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \ - $(CXXFLAGS) -BASEIPCCLIENT_OBJECTS = \ - $(OBJS)\baseipcclient_baseclient.obj -BASEIPCSERVER_CXXFLAGS = /M$(__RUNTIME_LIBS_50)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) /Fd$(OBJS)\baseipcserver.pdb $(____DEBUGRUNTIME) \ - $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \ - $(CXXFLAGS) -BASEIPCSERVER_OBJECTS = \ - $(OBJS)\baseipcserver_baseserver.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(USE_GUI)" == "1" -__ipcclient___depname = $(OBJS)\ipcclient.exe -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG) -!endif -!if "$(USE_GUI)" == "1" -__ipcserver___depname = $(OBJS)\ipcserver.exe -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_22 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_22 = $(__THREADSFLAG) -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_36 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_36 = $(__THREADSFLAG) -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_50 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_50 = $(__THREADSFLAG) -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_0 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_0 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_0 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_0 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_0 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_0 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_0 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_0 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_0 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_0 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_0 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_0 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_0 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_0 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_0 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_0 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_3 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_3 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_3 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_3 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG = T -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_NET_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(__ipcclient___depname) $(__ipcserver___depname) $(OBJS)\baseipcclient.exe $(OBJS)\baseipcserver.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\ipcclient.exe del $(OBJS)\ipcclient.exe - -if exist $(OBJS)\ipcclient.ilk del $(OBJS)\ipcclient.ilk - -if exist $(OBJS)\ipcclient.pdb del $(OBJS)\ipcclient.pdb - -if exist $(OBJS)\ipcserver.exe del $(OBJS)\ipcserver.exe - -if exist $(OBJS)\ipcserver.ilk del $(OBJS)\ipcserver.ilk - -if exist $(OBJS)\ipcserver.pdb del $(OBJS)\ipcserver.pdb - -if exist $(OBJS)\baseipcclient.exe del $(OBJS)\baseipcclient.exe - -if exist $(OBJS)\baseipcclient.ilk del $(OBJS)\baseipcclient.ilk - -if exist $(OBJS)\baseipcclient.pdb del $(OBJS)\baseipcclient.pdb - -if exist $(OBJS)\baseipcserver.exe del $(OBJS)\baseipcserver.exe - -if exist $(OBJS)\baseipcserver.ilk del $(OBJS)\baseipcserver.ilk - -if exist $(OBJS)\baseipcserver.pdb del $(OBJS)\baseipcserver.pdb - -!if "$(USE_GUI)" == "1" -$(OBJS)\ipcclient.exe: $(IPCCLIENT_OBJECTS) $(OBJS)\ipcclient_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_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 wininet.lib -<< -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\ipcserver.exe: $(IPCSERVER_OBJECTS) $(OBJS)\ipcserver_sample.res - 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 wininet.lib -<< -!endif - -$(OBJS)\baseipcclient.exe: $(BASEIPCCLIENT_OBJECTS) - 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 wininet.lib -<< - -$(OBJS)\baseipcserver.exe: $(BASEIPCSERVER_OBJECTS) - 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 wininet.lib -<< - -$(OBJS)\ipcclient_sample.res: .\..\..\samples\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_0) $(__NO_VC_CRTDBG_p_0) /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_0) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc - -$(OBJS)\ipcclient_client.obj: .\client.cpp - $(CXX) /c /nologo /TP /Fo$@ $(IPCCLIENT_CXXFLAGS) .\client.cpp - -$(OBJS)\ipcserver_sample.res: .\..\..\samples\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_0) $(__NO_VC_CRTDBG_p_0) /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_0) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc - -$(OBJS)\ipcserver_server.obj: .\server.cpp - $(CXX) /c /nologo /TP /Fo$@ $(IPCSERVER_CXXFLAGS) .\server.cpp - -$(OBJS)\baseipcclient_baseclient.obj: .\baseclient.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEIPCCLIENT_CXXFLAGS) .\baseclient.cpp - -$(OBJS)\baseipcserver_baseserver.obj: .\baseserver.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEIPCSERVER_CXXFLAGS) .\baseserver.cpp - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +IPCCLIENT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 \ + $(__DEBUGINFO) /Fd$(OBJS)\ipcclient.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) +IPCCLIENT_OBJECTS = \ + $(OBJS)\ipcclient_client.obj +IPCCLIENT_RESOURCES = \ + $(OBJS)\ipcclient_sample.res +IPCSERVER_CXXFLAGS = /M$(__RUNTIME_LIBS_26)$(__DEBUGRUNTIME) /DWIN32 \ + $(__DEBUGINFO) /Fd$(OBJS)\ipcserver.pdb $(__DEBUGINFO_18) \ + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) +IPCSERVER_OBJECTS = \ + $(OBJS)\ipcserver_server.obj +IPCSERVER_RESOURCES = \ + $(OBJS)\ipcserver_sample.res +BASEIPCCLIENT_CXXFLAGS = /M$(__RUNTIME_LIBS_42)$(__DEBUGRUNTIME) /DWIN32 \ + $(__DEBUGINFO) /Fd$(OBJS)\baseipcclient.pdb $(__DEBUGINFO_34) \ + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + $(CPPFLAGS) $(CXXFLAGS) +BASEIPCCLIENT_OBJECTS = \ + $(OBJS)\baseipcclient_baseclient.obj +BASEIPCSERVER_CXXFLAGS = /M$(__RUNTIME_LIBS_58)$(__DEBUGRUNTIME) /DWIN32 \ + $(__DEBUGINFO) /Fd$(OBJS)\baseipcserver.pdb $(__DEBUGINFO_50) \ + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + $(CPPFLAGS) $(CXXFLAGS) +BASEIPCSERVER_OBJECTS = \ + $(OBJS)\baseipcserver_baseserver.obj + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(USE_GUI)" == "1" +__ipcclient___depname = $(OBJS)\ipcclient.exe +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_2) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_2) +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG) +!endif +!if "$(USE_GUI)" == "1" +__ipcserver___depname = $(OBJS)\ipcserver.exe +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_18 = $(__DEBUGRUNTIME_2) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_18 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_18 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_18 = $(__DEBUGRUNTIME_2) +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_26 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_26 = $(__THREADSFLAG) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_34 = $(__DEBUGRUNTIME_2) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_34 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_34 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_34 = $(__DEBUGRUNTIME_2) +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_42 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_42 = $(__THREADSFLAG) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_50 = $(__DEBUGRUNTIME_2) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_50 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_50 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_50 = $(__DEBUGRUNTIME_2) +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_58 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_58 = $(__THREADSFLAG) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_0 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_0 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_0 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_0 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_0 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_0 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_0 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_0 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_0 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_0 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_0 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_0 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_0 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_0 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_0 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_0 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_4 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_4 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_4 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_4 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_2 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_2 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_2 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_2 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG = T +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_NET_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__ipcclient___depname) $(__ipcserver___depname) $(OBJS)\baseipcclient.exe $(OBJS)\baseipcserver.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\ipcclient.exe del $(OBJS)\ipcclient.exe + -if exist $(OBJS)\ipcclient.ilk del $(OBJS)\ipcclient.ilk + -if exist $(OBJS)\ipcclient.pdb del $(OBJS)\ipcclient.pdb + -if exist $(OBJS)\ipcserver.exe del $(OBJS)\ipcserver.exe + -if exist $(OBJS)\ipcserver.ilk del $(OBJS)\ipcserver.ilk + -if exist $(OBJS)\ipcserver.pdb del $(OBJS)\ipcserver.pdb + -if exist $(OBJS)\baseipcclient.exe del $(OBJS)\baseipcclient.exe + -if exist $(OBJS)\baseipcclient.ilk del $(OBJS)\baseipcclient.ilk + -if exist $(OBJS)\baseipcclient.pdb del $(OBJS)\baseipcclient.pdb + -if exist $(OBJS)\baseipcserver.exe del $(OBJS)\baseipcserver.exe + -if exist $(OBJS)\baseipcserver.ilk del $(OBJS)\baseipcserver.ilk + -if exist $(OBJS)\baseipcserver.pdb del $(OBJS)\baseipcserver.pdb + +!if "$(USE_GUI)" == "1" +$(OBJS)\ipcclient.exe: $(IPCCLIENT_OBJECTS) $(OBJS)\ipcclient_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\ipcclient.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(IPCCLIENT_OBJECTS) $(IPCCLIENT_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\ipcserver.exe: $(IPCSERVER_OBJECTS) $(OBJS)\ipcserver_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\ipcserver.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(IPCSERVER_OBJECTS) $(IPCSERVER_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< +!endif + +$(OBJS)\baseipcclient.exe: $(BASEIPCCLIENT_OBJECTS) + link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\baseipcclient.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< + $(BASEIPCCLIENT_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\baseipcserver.exe: $(BASEIPCSERVER_OBJECTS) + link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\baseipcserver.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< + $(BASEIPCSERVER_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\ipcclient_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_0) $(__NO_VC_CRTDBG_p_0) /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_0) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + +$(OBJS)\ipcclient_client.obj: .\client.cpp + $(CXX) /c /nologo /TP /Fo$@ $(IPCCLIENT_CXXFLAGS) .\client.cpp + +$(OBJS)\ipcserver_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_0) $(__NO_VC_CRTDBG_p_0) /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_0) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + +$(OBJS)\ipcserver_server.obj: .\server.cpp + $(CXX) /c /nologo /TP /Fo$@ $(IPCSERVER_CXXFLAGS) .\server.cpp + +$(OBJS)\baseipcclient_baseclient.obj: .\baseclient.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BASEIPCCLIENT_CXXFLAGS) .\baseclient.cpp + +$(OBJS)\baseipcserver_baseserver.obj: .\baseserver.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BASEIPCSERVER_CXXFLAGS) .\baseserver.cpp + diff --git a/samples/ipc/makefile.wat b/samples/ipc/makefile.wat index 419bce8126..a6cb0d5630 100644 --- a/samples/ipc/makefile.wat +++ b/samples/ipc/makefile.wat @@ -1,353 +1,353 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__ipcclient___depname = -!ifeq USE_GUI 1 -__ipcclient___depname = $(OBJS)\ipcclient.exe -!endif -__ipcserver___depname = -!ifeq USE_GUI 1 -__ipcserver___depname = $(OBJS)\ipcserver.exe -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__DEBUGINFO = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO = -d2 -!endif -__DEBUGINFO_3 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_3 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_3 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_3 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_3 = debug all -!endif -__OPTIMIZEFLAG = -!ifeq BUILD debug -__OPTIMIZEFLAG = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG = -ot -ox -!endif -__THREADSFLAG = -!ifeq USE_THREADS 0 -__THREADSFLAG = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG = -bm -!endif -__RUNTIME_LIBS = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS = -!endif -__RTTIFLAG = -!ifeq USE_RTTI 0 -__RTTIFLAG = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG = -xr -!endif -__EXCEPTIONSFLAG = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG = -xs -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif -__WXLIB_NET_p = -!ifeq MONOLITHIC 0 -__WXLIB_NET_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -IPCCLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & - $(CXXFLAGS) -IPCCLIENT_OBJECTS = & - $(OBJS)\ipcclient_client.obj -IPCSERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & - $(CXXFLAGS) -IPCSERVER_OBJECTS = & - $(OBJS)\ipcserver_server.obj -BASEIPCCLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -dwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -BASEIPCCLIENT_OBJECTS = & - $(OBJS)\baseipcclient_baseclient.obj -BASEIPCSERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -dwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -BASEIPCSERVER_OBJECTS = & - $(OBJS)\baseipcserver_baseserver.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(__ipcclient___depname) $(__ipcserver___depname) $(OBJS)\baseipcclient.exe $(OBJS)\baseipcserver.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\ipcclient.exe del $(OBJS)\ipcclient.exe - -if exist $(OBJS)\ipcserver.exe del $(OBJS)\ipcserver.exe - -if exist $(OBJS)\baseipcclient.exe del $(OBJS)\baseipcclient.exe - -if exist $(OBJS)\baseipcserver.exe del $(OBJS)\baseipcserver.exe - -!ifeq USE_GUI 1 -$(OBJS)\ipcclient.exe : $(IPCCLIENT_OBJECTS) $(OBJS)\ipcclient_sample.res - @%create $(OBJS)\ipcclient.lbc - @%append $(OBJS)\ipcclient.lbc option quiet - @%append $(OBJS)\ipcclient.lbc name $^@ - @%append $(OBJS)\ipcclient.lbc option caseexact - @%append $(OBJS)\ipcclient.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(IPCCLIENT_OBJECTS)) do @%append $(OBJS)\ipcclient.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\ipcclient.lbc library %i - @%append $(OBJS)\ipcclient.lbc option resource=$(OBJS)\ipcclient_sample.res - @for %i in () do @%append $(OBJS)\ipcclient.lbc option stack=%i - wlink @$(OBJS)\ipcclient.lbc -!endif - -!ifeq USE_GUI 1 -$(OBJS)\ipcserver.exe : $(IPCSERVER_OBJECTS) $(OBJS)\ipcserver_sample.res - @%create $(OBJS)\ipcserver.lbc - @%append $(OBJS)\ipcserver.lbc option quiet - @%append $(OBJS)\ipcserver.lbc name $^@ - @%append $(OBJS)\ipcserver.lbc option caseexact - @%append $(OBJS)\ipcserver.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(IPCSERVER_OBJECTS)) do @%append $(OBJS)\ipcserver.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\ipcserver.lbc library %i - @%append $(OBJS)\ipcserver.lbc option resource=$(OBJS)\ipcserver_sample.res - @for %i in () do @%append $(OBJS)\ipcserver.lbc option stack=%i - wlink @$(OBJS)\ipcserver.lbc -!endif - -$(OBJS)\baseipcclient.exe : $(BASEIPCCLIENT_OBJECTS) - @%create $(OBJS)\baseipcclient.lbc - @%append $(OBJS)\baseipcclient.lbc option quiet - @%append $(OBJS)\baseipcclient.lbc name $^@ - @%append $(OBJS)\baseipcclient.lbc option caseexact - @%append $(OBJS)\baseipcclient.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) - @for %i in ($(BASEIPCCLIENT_OBJECTS)) do @%append $(OBJS)\baseipcclient.lbc file %i - @for %i in ( $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\baseipcclient.lbc library %i - @%append $(OBJS)\baseipcclient.lbc - @for %i in () do @%append $(OBJS)\baseipcclient.lbc option stack=%i - wlink @$(OBJS)\baseipcclient.lbc - -$(OBJS)\baseipcserver.exe : $(BASEIPCSERVER_OBJECTS) - @%create $(OBJS)\baseipcserver.lbc - @%append $(OBJS)\baseipcserver.lbc option quiet - @%append $(OBJS)\baseipcserver.lbc name $^@ - @%append $(OBJS)\baseipcserver.lbc option caseexact - @%append $(OBJS)\baseipcserver.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) - @for %i in ($(BASEIPCSERVER_OBJECTS)) do @%append $(OBJS)\baseipcserver.lbc file %i - @for %i in ( $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\baseipcserver.lbc library %i - @%append $(OBJS)\baseipcserver.lbc - @for %i in () do @%append $(OBJS)\baseipcserver.lbc option stack=%i - wlink @$(OBJS)\baseipcserver.lbc - -$(OBJS)\ipcclient_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - -$(OBJS)\ipcclient_client.obj : .AUTODEPEND .\client.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(IPCCLIENT_CXXFLAGS) $< - -$(OBJS)\ipcserver_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - -$(OBJS)\ipcserver_server.obj : .AUTODEPEND .\server.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(IPCSERVER_CXXFLAGS) $< - -$(OBJS)\baseipcclient_baseclient.obj : .AUTODEPEND .\baseclient.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEIPCCLIENT_CXXFLAGS) $< - -$(OBJS)\baseipcserver_baseserver.obj : .AUTODEPEND .\baseserver.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEIPCSERVER_CXXFLAGS) $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__ipcclient___depname = +!ifeq USE_GUI 1 +__ipcclient___depname = $(OBJS)\ipcclient.exe +!endif +__ipcserver___depname = +!ifeq USE_GUI 1 +__ipcserver___depname = $(OBJS)\ipcserver.exe +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__DEBUGINFO = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO = -d2 +!endif +__DEBUGINFO_3 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_3 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_3 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_3 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_3 = debug all +!endif +__OPTIMIZEFLAG = +!ifeq BUILD debug +__OPTIMIZEFLAG = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG = -ot -ox +!endif +__THREADSFLAG = +!ifeq USE_THREADS 0 +__THREADSFLAG = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG = -bm +!endif +__RUNTIME_LIBS = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS = +!endif +__RTTIFLAG = +!ifeq USE_RTTI 0 +__RTTIFLAG = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG = -xr +!endif +__EXCEPTIONSFLAG = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG = -xs +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__WXLIB_NET_p = +!ifeq MONOLITHIC 0 +__WXLIB_NET_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +IPCCLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & + $(CXXFLAGS) +IPCCLIENT_OBJECTS = & + $(OBJS)\ipcclient_client.obj +IPCSERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & + $(CXXFLAGS) +IPCSERVER_OBJECTS = & + $(OBJS)\ipcserver_server.obj +BASEIPCCLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -dwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) +BASEIPCCLIENT_OBJECTS = & + $(OBJS)\baseipcclient_baseclient.obj +BASEIPCSERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -dwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) +BASEIPCSERVER_OBJECTS = & + $(OBJS)\baseipcserver_baseserver.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(__ipcclient___depname) $(__ipcserver___depname) $(OBJS)\baseipcclient.exe $(OBJS)\baseipcserver.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\ipcclient.exe del $(OBJS)\ipcclient.exe + -if exist $(OBJS)\ipcserver.exe del $(OBJS)\ipcserver.exe + -if exist $(OBJS)\baseipcclient.exe del $(OBJS)\baseipcclient.exe + -if exist $(OBJS)\baseipcserver.exe del $(OBJS)\baseipcserver.exe + +!ifeq USE_GUI 1 +$(OBJS)\ipcclient.exe : $(IPCCLIENT_OBJECTS) $(OBJS)\ipcclient_sample.res + @%create $(OBJS)\ipcclient.lbc + @%append $(OBJS)\ipcclient.lbc option quiet + @%append $(OBJS)\ipcclient.lbc name $^@ + @%append $(OBJS)\ipcclient.lbc option caseexact + @%append $(OBJS)\ipcclient.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(IPCCLIENT_OBJECTS)) do @%append $(OBJS)\ipcclient.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\ipcclient.lbc library %i + @%append $(OBJS)\ipcclient.lbc option resource=$(OBJS)\ipcclient_sample.res + @for %i in () do @%append $(OBJS)\ipcclient.lbc option stack=%i + wlink @$(OBJS)\ipcclient.lbc +!endif + +!ifeq USE_GUI 1 +$(OBJS)\ipcserver.exe : $(IPCSERVER_OBJECTS) $(OBJS)\ipcserver_sample.res + @%create $(OBJS)\ipcserver.lbc + @%append $(OBJS)\ipcserver.lbc option quiet + @%append $(OBJS)\ipcserver.lbc name $^@ + @%append $(OBJS)\ipcserver.lbc option caseexact + @%append $(OBJS)\ipcserver.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(IPCSERVER_OBJECTS)) do @%append $(OBJS)\ipcserver.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\ipcserver.lbc library %i + @%append $(OBJS)\ipcserver.lbc option resource=$(OBJS)\ipcserver_sample.res + @for %i in () do @%append $(OBJS)\ipcserver.lbc option stack=%i + wlink @$(OBJS)\ipcserver.lbc +!endif + +$(OBJS)\baseipcclient.exe : $(BASEIPCCLIENT_OBJECTS) + @%create $(OBJS)\baseipcclient.lbc + @%append $(OBJS)\baseipcclient.lbc option quiet + @%append $(OBJS)\baseipcclient.lbc name $^@ + @%append $(OBJS)\baseipcclient.lbc option caseexact + @%append $(OBJS)\baseipcclient.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) + @for %i in ($(BASEIPCCLIENT_OBJECTS)) do @%append $(OBJS)\baseipcclient.lbc file %i + @for %i in ( $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\baseipcclient.lbc library %i + @%append $(OBJS)\baseipcclient.lbc + @for %i in () do @%append $(OBJS)\baseipcclient.lbc option stack=%i + wlink @$(OBJS)\baseipcclient.lbc + +$(OBJS)\baseipcserver.exe : $(BASEIPCSERVER_OBJECTS) + @%create $(OBJS)\baseipcserver.lbc + @%append $(OBJS)\baseipcserver.lbc option quiet + @%append $(OBJS)\baseipcserver.lbc name $^@ + @%append $(OBJS)\baseipcserver.lbc option caseexact + @%append $(OBJS)\baseipcserver.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) + @for %i in ($(BASEIPCSERVER_OBJECTS)) do @%append $(OBJS)\baseipcserver.lbc file %i + @for %i in ( $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\baseipcserver.lbc library %i + @%append $(OBJS)\baseipcserver.lbc + @for %i in () do @%append $(OBJS)\baseipcserver.lbc option stack=%i + wlink @$(OBJS)\baseipcserver.lbc + +$(OBJS)\ipcclient_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + +$(OBJS)\ipcclient_client.obj : .AUTODEPEND .\client.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(IPCCLIENT_CXXFLAGS) $< + +$(OBJS)\ipcserver_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + +$(OBJS)\ipcserver_server.obj : .AUTODEPEND .\server.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(IPCSERVER_CXXFLAGS) $< + +$(OBJS)\baseipcclient_baseclient.obj : .AUTODEPEND .\baseclient.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASEIPCCLIENT_CXXFLAGS) $< + +$(OBJS)\baseipcserver_baseserver.obj : .AUTODEPEND .\baseserver.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASEIPCSERVER_CXXFLAGS) $< + diff --git a/samples/joytest/Makefile.in b/samples/joytest/Makefile.in index e812f1944b..49a81d8bf8 100644 --- a/samples/joytest/Makefile.in +++ b/samples/joytest/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/joytest/joytest.dsp b/samples/joytest/joytest.dsp index 97b0fb9436..71a83dd868 100644 --- a/samples/joytest/joytest.dsp +++ b/samples/joytest/joytest.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\joytest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\joytest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\joytest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\joytest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\joytest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\joytest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\joytest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\joytest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\joytest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\joytest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\joytest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\joytest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\joytest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\joytest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\joytest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\joytest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\joytest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\joytest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\joytest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\joytest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/joytest/joytest_vc7.vcproj b/samples/joytest/joytest_vc7.vcproj index ddf0be2b3e..b79ed2dd76 100644 --- a/samples/joytest/joytest_vc7.vcproj +++ b/samples/joytest/joytest_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\joytest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\joytest.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\joytest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\joytest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\joytest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\joytest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\joytest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\joytest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\joytest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\joytest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\joytest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\joytest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -JOYTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\joytest.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -JOYTEST_OBJECTS = \ - $(OBJS)\joytest_joytest.obj \ - $(OBJS)\joytest_joytest.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_ADV_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\joytest.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\joytest.exe del $(OBJS)\joytest.exe - -if exist $(OBJS)\joytest.ilk del $(OBJS)\joytest.ilk - -if exist $(OBJS)\joytest.pdb del $(OBJS)\joytest.pdb - -$(OBJS)\joytest.exe: $(JOYTEST_OBJECTS) $(OBJS)\joytest_joytest.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\joytest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(JOYTEST_OBJECTS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\joytest_joytest.obj: .\joytest.cpp - $(CXX) /c /nologo /TP /Fo$@ $(JOYTEST_CXXFLAGS) .\joytest.cpp - -$(OBJS)\joytest_joytest.res: .\joytest.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\joytest.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +JOYTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\joytest.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +JOYTEST_OBJECTS = \ + $(OBJS)\joytest_joytest.obj +JOYTEST_RESOURCES = \ + $(OBJS)\joytest_joytest.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_ADV_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\joytest.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\joytest.exe del $(OBJS)\joytest.exe + -if exist $(OBJS)\joytest.ilk del $(OBJS)\joytest.ilk + -if exist $(OBJS)\joytest.pdb del $(OBJS)\joytest.pdb + +$(OBJS)\joytest.exe: $(JOYTEST_OBJECTS) $(OBJS)\joytest_joytest.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\joytest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(JOYTEST_OBJECTS) $(JOYTEST_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\joytest_joytest.obj: .\joytest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(JOYTEST_CXXFLAGS) .\joytest.cpp + +$(OBJS)\joytest_joytest.res: .\joytest.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\joytest.rc + diff --git a/samples/joytest/makefile.wat b/samples/joytest/makefile.wat index b7a3320d03..7b2dd44209 100644 --- a/samples/joytest/makefile.wat +++ b/samples/joytest/makefile.wat @@ -1,265 +1,265 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_ADV_p = -!ifeq MONOLITHIC 0 -__WXLIB_ADV_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -JOYTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -JOYTEST_OBJECTS = & - $(OBJS)\joytest_joytest.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\joytest.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\joytest.exe del $(OBJS)\joytest.exe - -$(OBJS)\joytest.exe : $(JOYTEST_OBJECTS) $(OBJS)\joytest_joytest.res - @%create $(OBJS)\joytest.lbc - @%append $(OBJS)\joytest.lbc option quiet - @%append $(OBJS)\joytest.lbc name $^@ - @%append $(OBJS)\joytest.lbc option caseexact - @%append $(OBJS)\joytest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(JOYTEST_OBJECTS)) do @%append $(OBJS)\joytest.lbc file %i - @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\joytest.lbc library %i - @%append $(OBJS)\joytest.lbc option resource=$(OBJS)\joytest_joytest.res - @for %i in () do @%append $(OBJS)\joytest.lbc option stack=%i - wlink @$(OBJS)\joytest.lbc - -$(OBJS)\joytest_joytest.obj : .AUTODEPEND .\joytest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(JOYTEST_CXXFLAGS) $< - -$(OBJS)\joytest_joytest.res : .AUTODEPEND .\joytest.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +JOYTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +JOYTEST_OBJECTS = & + $(OBJS)\joytest_joytest.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\joytest.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\joytest.exe del $(OBJS)\joytest.exe + +$(OBJS)\joytest.exe : $(JOYTEST_OBJECTS) $(OBJS)\joytest_joytest.res + @%create $(OBJS)\joytest.lbc + @%append $(OBJS)\joytest.lbc option quiet + @%append $(OBJS)\joytest.lbc name $^@ + @%append $(OBJS)\joytest.lbc option caseexact + @%append $(OBJS)\joytest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(JOYTEST_OBJECTS)) do @%append $(OBJS)\joytest.lbc file %i + @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\joytest.lbc library %i + @%append $(OBJS)\joytest.lbc option resource=$(OBJS)\joytest_joytest.res + @for %i in () do @%append $(OBJS)\joytest.lbc option stack=%i + wlink @$(OBJS)\joytest.lbc + +$(OBJS)\joytest_joytest.obj : .AUTODEPEND .\joytest.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(JOYTEST_CXXFLAGS) $< + +$(OBJS)\joytest_joytest.res : .AUTODEPEND .\joytest.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/keyboard/Makefile.in b/samples/keyboard/Makefile.in index 87ffd72c80..96ed5ac69a 100644 --- a/samples/keyboard/Makefile.in +++ b/samples/keyboard/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/keyboard/keyboard.dsp b/samples/keyboard/keyboard.dsp index ddc2ef3fa7..720e1b8b2c 100644 --- a/samples/keyboard/keyboard.dsp +++ b/samples/keyboard/keyboard.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\keyboard" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\keyboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\keyboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\keyboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\keyboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\keyboard" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\keyboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\keyboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\keyboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\keyboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\keyboard" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\keyboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\keyboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\keyboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\keyboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\keyboard" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\keyboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\keyboard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\keyboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\keyboard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/keyboard/keyboard_vc7.vcproj b/samples/keyboard/keyboard_vc7.vcproj index fa792c7d20..708b198c7a 100644 --- a/samples/keyboard/keyboard_vc7.vcproj +++ b/samples/keyboard/keyboard_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\keyboard.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\keyboard.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\keyboard.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\keyboard.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\keyboard.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\keyboard.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\keyboard.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\keyboard.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\keyboard.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\keyboard.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\keyboard.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\keyboard.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -KEYBOARD_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\keyboard.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -KEYBOARD_OBJECTS = \ - $(OBJS)\keyboard_keyboard.obj \ - $(OBJS)\keyboard_keyboard.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\keyboard.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\keyboard.exe del $(OBJS)\keyboard.exe - -if exist $(OBJS)\keyboard.ilk del $(OBJS)\keyboard.ilk - -if exist $(OBJS)\keyboard.pdb del $(OBJS)\keyboard.pdb - -$(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_keyboard.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\keyboard.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(KEYBOARD_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\keyboard_keyboard.obj: .\keyboard.cpp - $(CXX) /c /nologo /TP /Fo$@ $(KEYBOARD_CXXFLAGS) .\keyboard.cpp - -$(OBJS)\keyboard_keyboard.res: .\keyboard.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\keyboard.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +KEYBOARD_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\keyboard.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +KEYBOARD_OBJECTS = \ + $(OBJS)\keyboard_keyboard.obj +KEYBOARD_RESOURCES = \ + $(OBJS)\keyboard_keyboard.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\keyboard.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\keyboard.exe del $(OBJS)\keyboard.exe + -if exist $(OBJS)\keyboard.ilk del $(OBJS)\keyboard.ilk + -if exist $(OBJS)\keyboard.pdb del $(OBJS)\keyboard.pdb + +$(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_keyboard.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\keyboard.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(KEYBOARD_OBJECTS) $(KEYBOARD_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\keyboard_keyboard.obj: .\keyboard.cpp + $(CXX) /c /nologo /TP /Fo$@ $(KEYBOARD_CXXFLAGS) .\keyboard.cpp + +$(OBJS)\keyboard_keyboard.res: .\keyboard.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\keyboard.rc + diff --git a/samples/keyboard/makefile.wat b/samples/keyboard/makefile.wat index fcf3956e4d..c210cc601b 100644 --- a/samples/keyboard/makefile.wat +++ b/samples/keyboard/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -KEYBOARD_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -KEYBOARD_OBJECTS = & - $(OBJS)\keyboard_keyboard.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\keyboard.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\keyboard.exe del $(OBJS)\keyboard.exe - -$(OBJS)\keyboard.exe : $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_keyboard.res - @%create $(OBJS)\keyboard.lbc - @%append $(OBJS)\keyboard.lbc option quiet - @%append $(OBJS)\keyboard.lbc name $^@ - @%append $(OBJS)\keyboard.lbc option caseexact - @%append $(OBJS)\keyboard.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(KEYBOARD_OBJECTS)) do @%append $(OBJS)\keyboard.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\keyboard.lbc library %i - @%append $(OBJS)\keyboard.lbc option resource=$(OBJS)\keyboard_keyboard.res - @for %i in () do @%append $(OBJS)\keyboard.lbc option stack=%i - wlink @$(OBJS)\keyboard.lbc - -$(OBJS)\keyboard_keyboard.obj : .AUTODEPEND .\keyboard.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(KEYBOARD_CXXFLAGS) $< - -$(OBJS)\keyboard_keyboard.res : .AUTODEPEND .\keyboard.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +KEYBOARD_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +KEYBOARD_OBJECTS = & + $(OBJS)\keyboard_keyboard.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\keyboard.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\keyboard.exe del $(OBJS)\keyboard.exe + +$(OBJS)\keyboard.exe : $(KEYBOARD_OBJECTS) $(OBJS)\keyboard_keyboard.res + @%create $(OBJS)\keyboard.lbc + @%append $(OBJS)\keyboard.lbc option quiet + @%append $(OBJS)\keyboard.lbc name $^@ + @%append $(OBJS)\keyboard.lbc option caseexact + @%append $(OBJS)\keyboard.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(KEYBOARD_OBJECTS)) do @%append $(OBJS)\keyboard.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\keyboard.lbc library %i + @%append $(OBJS)\keyboard.lbc option resource=$(OBJS)\keyboard_keyboard.res + @for %i in () do @%append $(OBJS)\keyboard.lbc option stack=%i + wlink @$(OBJS)\keyboard.lbc + +$(OBJS)\keyboard_keyboard.obj : .AUTODEPEND .\keyboard.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(KEYBOARD_CXXFLAGS) $< + +$(OBJS)\keyboard_keyboard.res : .AUTODEPEND .\keyboard.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in index cb05ad3040..696b9ef2fa 100644 --- a/samples/layout/Makefile.in +++ b/samples/layout/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/layout/layout.dsp b/samples/layout/layout.dsp index b085cd750a..16be621cf4 100644 --- a/samples/layout/layout.dsp +++ b/samples/layout/layout.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\layout" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\layout.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\layout.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\layout.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\layout.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\layout" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\layout.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\layout.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\layout.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\layout.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\layout" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\layout.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\layout.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\layout.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\layout.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\layout" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\layout.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\layout.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\layout.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\layout.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/layout/layout_vc7.vcproj b/samples/layout/layout_vc7.vcproj index 335195173c..b8635c3a1c 100644 --- a/samples/layout/layout_vc7.vcproj +++ b/samples/layout/layout_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\layout.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\layout.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\layout.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\layout.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\layout.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\layout.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\layout.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\layout.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\layout.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\layout.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\layout.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\layout.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -LAYOUT_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\layout.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -LAYOUT_OBJECTS = \ - $(OBJS)\layout_layout.obj \ - $(OBJS)\layout_layout.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\layout.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\layout.exe del $(OBJS)\layout.exe - -if exist $(OBJS)\layout.ilk del $(OBJS)\layout.ilk - -if exist $(OBJS)\layout.pdb del $(OBJS)\layout.pdb - -$(OBJS)\layout.exe: $(LAYOUT_OBJECTS) $(OBJS)\layout_layout.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\layout.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(LAYOUT_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\layout_layout.obj: .\layout.cpp - $(CXX) /c /nologo /TP /Fo$@ $(LAYOUT_CXXFLAGS) .\layout.cpp - -$(OBJS)\layout_layout.res: .\layout.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\layout.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +LAYOUT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\layout.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +LAYOUT_OBJECTS = \ + $(OBJS)\layout_layout.obj +LAYOUT_RESOURCES = \ + $(OBJS)\layout_layout.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\layout.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\layout.exe del $(OBJS)\layout.exe + -if exist $(OBJS)\layout.ilk del $(OBJS)\layout.ilk + -if exist $(OBJS)\layout.pdb del $(OBJS)\layout.pdb + +$(OBJS)\layout.exe: $(LAYOUT_OBJECTS) $(OBJS)\layout_layout.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\layout.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(LAYOUT_OBJECTS) $(LAYOUT_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\layout_layout.obj: .\layout.cpp + $(CXX) /c /nologo /TP /Fo$@ $(LAYOUT_CXXFLAGS) .\layout.cpp + +$(OBJS)\layout_layout.res: .\layout.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\layout.rc + diff --git a/samples/layout/makefile.wat b/samples/layout/makefile.wat index 95552911fc..058af4a543 100644 --- a/samples/layout/makefile.wat +++ b/samples/layout/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -LAYOUT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -LAYOUT_OBJECTS = & - $(OBJS)\layout_layout.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\layout.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\layout.exe del $(OBJS)\layout.exe - -$(OBJS)\layout.exe : $(LAYOUT_OBJECTS) $(OBJS)\layout_layout.res - @%create $(OBJS)\layout.lbc - @%append $(OBJS)\layout.lbc option quiet - @%append $(OBJS)\layout.lbc name $^@ - @%append $(OBJS)\layout.lbc option caseexact - @%append $(OBJS)\layout.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(LAYOUT_OBJECTS)) do @%append $(OBJS)\layout.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\layout.lbc library %i - @%append $(OBJS)\layout.lbc option resource=$(OBJS)\layout_layout.res - @for %i in () do @%append $(OBJS)\layout.lbc option stack=%i - wlink @$(OBJS)\layout.lbc - -$(OBJS)\layout_layout.obj : .AUTODEPEND .\layout.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(LAYOUT_CXXFLAGS) $< - -$(OBJS)\layout_layout.res : .AUTODEPEND .\layout.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +LAYOUT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +LAYOUT_OBJECTS = & + $(OBJS)\layout_layout.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\layout.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\layout.exe del $(OBJS)\layout.exe + +$(OBJS)\layout.exe : $(LAYOUT_OBJECTS) $(OBJS)\layout_layout.res + @%create $(OBJS)\layout.lbc + @%append $(OBJS)\layout.lbc option quiet + @%append $(OBJS)\layout.lbc name $^@ + @%append $(OBJS)\layout.lbc option caseexact + @%append $(OBJS)\layout.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(LAYOUT_OBJECTS)) do @%append $(OBJS)\layout.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\layout.lbc library %i + @%append $(OBJS)\layout.lbc option resource=$(OBJS)\layout_layout.res + @for %i in () do @%append $(OBJS)\layout.lbc option stack=%i + wlink @$(OBJS)\layout.lbc + +$(OBJS)\layout_layout.obj : .AUTODEPEND .\layout.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(LAYOUT_CXXFLAGS) $< + +$(OBJS)\layout_layout.res : .AUTODEPEND .\layout.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/listctrl/Makefile.in b/samples/listctrl/Makefile.in index acfb2d7b69..a94f78bab2 100644 --- a/samples/listctrl/Makefile.in +++ b/samples/listctrl/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/listctrl/listctrl.dsp b/samples/listctrl/listctrl.dsp index 2249db61cd..62ea222681 100644 --- a/samples/listctrl/listctrl.dsp +++ b/samples/listctrl/listctrl.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\listctrl" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\listctrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\listctrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\listctrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\listctrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\listctrl" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\listctrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\listctrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\listctrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\listctrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\listctrl" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\listctrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\listctrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\listctrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\listctrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\listctrl" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\listctrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\listctrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\listctrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\listctrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/listctrl/listctrl_vc7.vcproj b/samples/listctrl/listctrl_vc7.vcproj index 9aa4a7d69f..593ef25764 100644 --- a/samples/listctrl/listctrl_vc7.vcproj +++ b/samples/listctrl/listctrl_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\listctrl.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\listctrl.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\listctrl.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\listctrl.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\listctrl.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\listctrl.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\listctrl.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\listctrl.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\listctrl.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\listctrl.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\listctrl.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\listctrl.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -LISTCTRL_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\listctrl.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -LISTCTRL_OBJECTS = \ - $(OBJS)\listctrl_listtest.obj \ - $(OBJS)\listctrl_listtest.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\listctrl.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\listctrl.exe del $(OBJS)\listctrl.exe - -if exist $(OBJS)\listctrl.ilk del $(OBJS)\listctrl.ilk - -if exist $(OBJS)\listctrl.pdb del $(OBJS)\listctrl.pdb - -$(OBJS)\listctrl.exe: $(LISTCTRL_OBJECTS) $(OBJS)\listctrl_listtest.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\listctrl.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(LISTCTRL_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\listctrl_listtest.obj: .\listtest.cpp - $(CXX) /c /nologo /TP /Fo$@ $(LISTCTRL_CXXFLAGS) .\listtest.cpp - -$(OBJS)\listctrl_listtest.res: .\listtest.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\listtest.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +LISTCTRL_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\listctrl.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +LISTCTRL_OBJECTS = \ + $(OBJS)\listctrl_listtest.obj +LISTCTRL_RESOURCES = \ + $(OBJS)\listctrl_listtest.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\listctrl.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\listctrl.exe del $(OBJS)\listctrl.exe + -if exist $(OBJS)\listctrl.ilk del $(OBJS)\listctrl.ilk + -if exist $(OBJS)\listctrl.pdb del $(OBJS)\listctrl.pdb + +$(OBJS)\listctrl.exe: $(LISTCTRL_OBJECTS) $(OBJS)\listctrl_listtest.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\listctrl.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(LISTCTRL_OBJECTS) $(LISTCTRL_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\listctrl_listtest.obj: .\listtest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(LISTCTRL_CXXFLAGS) .\listtest.cpp + +$(OBJS)\listctrl_listtest.res: .\listtest.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\listtest.rc + diff --git a/samples/listctrl/makefile.wat b/samples/listctrl/makefile.wat index 7da8853140..c1a198f2a3 100644 --- a/samples/listctrl/makefile.wat +++ b/samples/listctrl/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -LISTCTRL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -LISTCTRL_OBJECTS = & - $(OBJS)\listctrl_listtest.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\listctrl.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\listctrl.exe del $(OBJS)\listctrl.exe - -$(OBJS)\listctrl.exe : $(LISTCTRL_OBJECTS) $(OBJS)\listctrl_listtest.res - @%create $(OBJS)\listctrl.lbc - @%append $(OBJS)\listctrl.lbc option quiet - @%append $(OBJS)\listctrl.lbc name $^@ - @%append $(OBJS)\listctrl.lbc option caseexact - @%append $(OBJS)\listctrl.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(LISTCTRL_OBJECTS)) do @%append $(OBJS)\listctrl.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\listctrl.lbc library %i - @%append $(OBJS)\listctrl.lbc option resource=$(OBJS)\listctrl_listtest.res - @for %i in () do @%append $(OBJS)\listctrl.lbc option stack=%i - wlink @$(OBJS)\listctrl.lbc - -$(OBJS)\listctrl_listtest.obj : .AUTODEPEND .\listtest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(LISTCTRL_CXXFLAGS) $< - -$(OBJS)\listctrl_listtest.res : .AUTODEPEND .\listtest.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +LISTCTRL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +LISTCTRL_OBJECTS = & + $(OBJS)\listctrl_listtest.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\listctrl.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\listctrl.exe del $(OBJS)\listctrl.exe + +$(OBJS)\listctrl.exe : $(LISTCTRL_OBJECTS) $(OBJS)\listctrl_listtest.res + @%create $(OBJS)\listctrl.lbc + @%append $(OBJS)\listctrl.lbc option quiet + @%append $(OBJS)\listctrl.lbc name $^@ + @%append $(OBJS)\listctrl.lbc option caseexact + @%append $(OBJS)\listctrl.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(LISTCTRL_OBJECTS)) do @%append $(OBJS)\listctrl.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\listctrl.lbc library %i + @%append $(OBJS)\listctrl.lbc option resource=$(OBJS)\listctrl_listtest.res + @for %i in () do @%append $(OBJS)\listctrl.lbc option stack=%i + wlink @$(OBJS)\listctrl.lbc + +$(OBJS)\listctrl_listtest.obj : .AUTODEPEND .\listtest.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(LISTCTRL_CXXFLAGS) $< + +$(OBJS)\listctrl_listtest.res : .AUTODEPEND .\listtest.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/makefile.bcc b/samples/makefile.bcc index d18e929461..3d7008f799 100644 --- a/samples/makefile.bcc +++ b/samples/makefile.bcc @@ -1,823 +1,823 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -.autodepend - -!ifndef BCCDIR -!ifndef MAKEDIR -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif -BCCDIR = $(MAKEDIR)\.. -!endif - -!include ../build/msw/config.bcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ - -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \ - -DCPP="$(CPP)" -DSHARED="$(SHARED)" -DWXUNIV="$(WXUNIV)" \ - -DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" -DBUILD="$(BUILD)" \ - -DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \ - -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \ - -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \ - -DUSE_AUI="$(USE_AUI)" -DUSE_RIBBON="$(USE_RIBBON)" \ - -DUSE_PROPGRID="$(USE_PROPGRID)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \ - -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \ - -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \ - -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \ - -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \ - -DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \ - -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \ - -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" - -### Conditionally set variables: ### - - - -### Targets: ### - -all: access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power printing propgrid regtest render ribbon richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer xrc - -clean: - -if exist .\*.obj del .\*.obj - -if exist .\*.res del .\*.res - -if exist .\*.csm del .\*.csm - @echo cd access >access.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>access.bat - call access.bat - @del access.bat - @echo cd animate >animate.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>animate.bat - call animate.bat - @del animate.bat - @echo cd artprov >artprov.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>artprov.bat - call artprov.bat - @del artprov.bat - @echo cd aui >aui.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>aui.bat - call aui.bat - @del aui.bat - @echo cd calendar >calendar.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>calendar.bat - call calendar.bat - @del calendar.bat - @echo cd caret >caret.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>caret.bat - call caret.bat - @del caret.bat - @echo cd clipboard >clipboard.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>clipboard.bat - call clipboard.bat - @del clipboard.bat - @echo cd collpane >collpane.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>collpane.bat - call collpane.bat - @del collpane.bat - @echo cd combo >combo.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>combo.bat - call combo.bat - @del combo.bat - @echo cd config >config.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>config.bat - call config.bat - @del config.bat - @echo cd console >console.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>console.bat - call console.bat - @del console.bat - @echo cd controls >controls.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>controls.bat - call controls.bat - @del controls.bat - @echo cd dataview >dataview.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>dataview.bat - call dataview.bat - @del dataview.bat - @echo cd dialogs >dialogs.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>dialogs.bat - call dialogs.bat - @del dialogs.bat - @echo cd dialup >dialup.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>dialup.bat - call dialup.bat - @del dialup.bat - @echo cd display >display.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>display.bat - call display.bat - @del display.bat - @echo cd dnd >dnd.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>dnd.bat - call dnd.bat - @del dnd.bat - @echo cd docview >docview.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>docview.bat - call docview.bat - @del docview.bat - @echo cd dragimag >dragimag.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>dragimag.bat - call dragimag.bat - @del dragimag.bat - @echo cd drawing >drawing.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>drawing.bat - call drawing.bat - @del drawing.bat - @echo cd erase >erase.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>erase.bat - call erase.bat - @del erase.bat - @echo cd event >event.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>event.bat - call event.bat - @del event.bat - @echo cd except >except.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>except.bat - call except.bat - @del except.bat - @echo cd exec >exec.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>exec.bat - call exec.bat - @del exec.bat - @echo cd font >font.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>font.bat - call font.bat - @del font.bat - @echo cd grid >grid.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>grid.bat - call grid.bat - @del grid.bat - @echo cd help >help.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>help.bat - call help.bat - @del help.bat - @echo cd htlbox >htlbox.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>htlbox.bat - call htlbox.bat - @del htlbox.bat - @echo cd html >html.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>html.bat - call html.bat - @del html.bat - @echo cd image >image.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>image.bat - call image.bat - @del image.bat - @echo cd internat >internat.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>internat.bat - call internat.bat - @del internat.bat - @echo cd ipc >ipc.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>ipc.bat - call ipc.bat - @del ipc.bat - @echo cd joytest >joytest.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>joytest.bat - call joytest.bat - @del joytest.bat - @echo cd keyboard >keyboard.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>keyboard.bat - call keyboard.bat - @del keyboard.bat - @echo cd layout >layout.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>layout.bat - call layout.bat - @del layout.bat - @echo cd listctrl >listctrl.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>listctrl.bat - call listctrl.bat - @del listctrl.bat - @echo cd mdi >mdi.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>mdi.bat - call mdi.bat - @del mdi.bat - @echo cd mediaplayer >mediaplayer.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>mediaplayer.bat - call mediaplayer.bat - @del mediaplayer.bat - @echo cd menu >menu.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>menu.bat - call menu.bat - @del menu.bat - @echo cd minimal >minimal.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>minimal.bat - call minimal.bat - @del minimal.bat - @echo cd nativdlg >nativdlg.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>nativdlg.bat - call nativdlg.bat - @del nativdlg.bat - @echo cd notebook >notebook.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>notebook.bat - call notebook.bat - @del notebook.bat - @echo cd oleauto >oleauto.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>oleauto.bat - call oleauto.bat - @del oleauto.bat - @echo cd opengl >opengl.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>opengl.bat - call opengl.bat - @del opengl.bat - @echo cd ownerdrw >ownerdrw.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>ownerdrw.bat - call ownerdrw.bat - @del ownerdrw.bat - @echo cd popup >popup.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>popup.bat - call popup.bat - @del popup.bat - @echo cd power >power.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>power.bat - call power.bat - @del power.bat - @echo cd printing >printing.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>printing.bat - call printing.bat - @del printing.bat - @echo cd propgrid >propgrid.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>propgrid.bat - call propgrid.bat - @del propgrid.bat - @echo cd regtest >regtest.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>regtest.bat - call regtest.bat - @del regtest.bat - @echo cd render >render.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>render.bat - call render.bat - @del render.bat - @echo cd ribbon >ribbon.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>ribbon.bat - call ribbon.bat - @del ribbon.bat - @echo cd richtext >richtext.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>richtext.bat - call richtext.bat - @del richtext.bat - @echo cd sashtest >sashtest.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>sashtest.bat - call sashtest.bat - @del sashtest.bat - @echo cd scroll >scroll.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>scroll.bat - call scroll.bat - @del scroll.bat - @echo cd shaped >shaped.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>shaped.bat - call shaped.bat - @del shaped.bat - @echo cd sockets >sockets.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>sockets.bat - call sockets.bat - @del sockets.bat - @echo cd sound >sound.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>sound.bat - call sound.bat - @del sound.bat - @echo cd splash >splash.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>splash.bat - call splash.bat - @del splash.bat - @echo cd splitter >splitter.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>splitter.bat - call splitter.bat - @del splitter.bat - @echo cd statbar >statbar.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>statbar.bat - call statbar.bat - @del statbar.bat - @echo cd stc >stc.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>stc.bat - call stc.bat - @del stc.bat - @echo cd svg >svg.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>svg.bat - call svg.bat - @del svg.bat - @echo cd taborder >taborder.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>taborder.bat - call taborder.bat - @del taborder.bat - @echo cd taskbar >taskbar.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>taskbar.bat - call taskbar.bat - @del taskbar.bat - @echo cd text >text.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>text.bat - call text.bat - @del text.bat - @echo cd thread >thread.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>thread.bat - call thread.bat - @del thread.bat - @echo cd toolbar >toolbar.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>toolbar.bat - call toolbar.bat - @del toolbar.bat - @echo cd treectrl >treectrl.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>treectrl.bat - call treectrl.bat - @del treectrl.bat - @echo cd typetest >typetest.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>typetest.bat - call typetest.bat - @del typetest.bat - @echo cd validate >validate.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>validate.bat - call validate.bat - @del validate.bat - @echo cd vscroll >vscroll.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>vscroll.bat - call vscroll.bat - @del vscroll.bat - @echo cd widgets >widgets.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>widgets.bat - call widgets.bat - @del widgets.bat - @echo cd wizard >wizard.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>wizard.bat - call wizard.bat - @del wizard.bat - @echo cd wrapsizer >wrapsizer.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>wrapsizer.bat - call wrapsizer.bat - @del wrapsizer.bat - @echo cd xrc >xrc.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>xrc.bat - call xrc.bat - @del xrc.bat - @echo cd memcheck >memcheck.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>memcheck.bat - call memcheck.bat - @del memcheck.bat - -access: - @echo cd access >access.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>access.bat - call access.bat - @del access.bat - -animate: - @echo cd animate >animate.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>animate.bat - call animate.bat - @del animate.bat - -artprov: - @echo cd artprov >artprov.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>artprov.bat - call artprov.bat - @del artprov.bat - -aui: - @echo cd aui >aui.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>aui.bat - call aui.bat - @del aui.bat - -calendar: - @echo cd calendar >calendar.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>calendar.bat - call calendar.bat - @del calendar.bat - -caret: - @echo cd caret >caret.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>caret.bat - call caret.bat - @del caret.bat - -clipboard: - @echo cd clipboard >clipboard.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>clipboard.bat - call clipboard.bat - @del clipboard.bat - -collpane: - @echo cd collpane >collpane.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>collpane.bat - call collpane.bat - @del collpane.bat - -combo: - @echo cd combo >combo.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>combo.bat - call combo.bat - @del combo.bat - -config: - @echo cd config >config.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>config.bat - call config.bat - @del config.bat - -console: - @echo cd console >console.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>console.bat - call console.bat - @del console.bat - -controls: - @echo cd controls >controls.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>controls.bat - call controls.bat - @del controls.bat - -dataview: - @echo cd dataview >dataview.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>dataview.bat - call dataview.bat - @del dataview.bat - -dialogs: - @echo cd dialogs >dialogs.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>dialogs.bat - call dialogs.bat - @del dialogs.bat - -dialup: - @echo cd dialup >dialup.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>dialup.bat - call dialup.bat - @del dialup.bat - -display: - @echo cd display >display.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>display.bat - call display.bat - @del display.bat - -dnd: - @echo cd dnd >dnd.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>dnd.bat - call dnd.bat - @del dnd.bat - -docview: - @echo cd docview >docview.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>docview.bat - call docview.bat - @del docview.bat - -dragimag: - @echo cd dragimag >dragimag.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>dragimag.bat - call dragimag.bat - @del dragimag.bat - -drawing: - @echo cd drawing >drawing.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>drawing.bat - call drawing.bat - @del drawing.bat - -erase: - @echo cd erase >erase.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>erase.bat - call erase.bat - @del erase.bat - -event: - @echo cd event >event.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>event.bat - call event.bat - @del event.bat - -except: - @echo cd except >except.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>except.bat - call except.bat - @del except.bat - -exec: - @echo cd exec >exec.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>exec.bat - call exec.bat - @del exec.bat - -font: - @echo cd font >font.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>font.bat - call font.bat - @del font.bat - -grid: - @echo cd grid >grid.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>grid.bat - call grid.bat - @del grid.bat - -help: - @echo cd help >help.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>help.bat - call help.bat - @del help.bat - -htlbox: - @echo cd htlbox >htlbox.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>htlbox.bat - call htlbox.bat - @del htlbox.bat - -html: - @echo cd html >html.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>html.bat - call html.bat - @del html.bat - -image: - @echo cd image >image.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>image.bat - call image.bat - @del image.bat - -internat: - @echo cd internat >internat.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>internat.bat - call internat.bat - @del internat.bat - -ipc: - @echo cd ipc >ipc.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>ipc.bat - call ipc.bat - @del ipc.bat - -joytest: - @echo cd joytest >joytest.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>joytest.bat - call joytest.bat - @del joytest.bat - -keyboard: - @echo cd keyboard >keyboard.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>keyboard.bat - call keyboard.bat - @del keyboard.bat - -layout: - @echo cd layout >layout.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>layout.bat - call layout.bat - @del layout.bat - -listctrl: - @echo cd listctrl >listctrl.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>listctrl.bat - call listctrl.bat - @del listctrl.bat - -mdi: - @echo cd mdi >mdi.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>mdi.bat - call mdi.bat - @del mdi.bat - -mediaplayer: - @echo cd mediaplayer >mediaplayer.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>mediaplayer.bat - call mediaplayer.bat - @del mediaplayer.bat - -menu: - @echo cd menu >menu.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>menu.bat - call menu.bat - @del menu.bat - -minimal: - @echo cd minimal >minimal.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>minimal.bat - call minimal.bat - @del minimal.bat - -nativdlg: - @echo cd nativdlg >nativdlg.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>nativdlg.bat - call nativdlg.bat - @del nativdlg.bat - -notebook: - @echo cd notebook >notebook.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>notebook.bat - call notebook.bat - @del notebook.bat - -oleauto: - @echo cd oleauto >oleauto.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>oleauto.bat - call oleauto.bat - @del oleauto.bat - -opengl: - @echo cd opengl >opengl.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>opengl.bat - call opengl.bat - @del opengl.bat - -ownerdrw: - @echo cd ownerdrw >ownerdrw.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>ownerdrw.bat - call ownerdrw.bat - @del ownerdrw.bat - -popup: - @echo cd popup >popup.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>popup.bat - call popup.bat - @del popup.bat - -power: - @echo cd power >power.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>power.bat - call power.bat - @del power.bat - -printing: - @echo cd printing >printing.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>printing.bat - call printing.bat - @del printing.bat - -propgrid: - @echo cd propgrid >propgrid.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>propgrid.bat - call propgrid.bat - @del propgrid.bat - -regtest: - @echo cd regtest >regtest.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>regtest.bat - call regtest.bat - @del regtest.bat - -render: - @echo cd render >render.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>render.bat - call render.bat - @del render.bat - -ribbon: - @echo cd ribbon >ribbon.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>ribbon.bat - call ribbon.bat - @del ribbon.bat - -richtext: - @echo cd richtext >richtext.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>richtext.bat - call richtext.bat - @del richtext.bat - -sashtest: - @echo cd sashtest >sashtest.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>sashtest.bat - call sashtest.bat - @del sashtest.bat - -scroll: - @echo cd scroll >scroll.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>scroll.bat - call scroll.bat - @del scroll.bat - -shaped: - @echo cd shaped >shaped.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>shaped.bat - call shaped.bat - @del shaped.bat - -sockets: - @echo cd sockets >sockets.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>sockets.bat - call sockets.bat - @del sockets.bat - -sound: - @echo cd sound >sound.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>sound.bat - call sound.bat - @del sound.bat - -splash: - @echo cd splash >splash.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>splash.bat - call splash.bat - @del splash.bat - -splitter: - @echo cd splitter >splitter.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>splitter.bat - call splitter.bat - @del splitter.bat - -statbar: - @echo cd statbar >statbar.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>statbar.bat - call statbar.bat - @del statbar.bat - -stc: - @echo cd stc >stc.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>stc.bat - call stc.bat - @del stc.bat - -svg: - @echo cd svg >svg.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>svg.bat - call svg.bat - @del svg.bat - -taborder: - @echo cd taborder >taborder.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>taborder.bat - call taborder.bat - @del taborder.bat - -taskbar: - @echo cd taskbar >taskbar.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>taskbar.bat - call taskbar.bat - @del taskbar.bat - -text: - @echo cd text >text.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>text.bat - call text.bat - @del text.bat - -thread: - @echo cd thread >thread.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>thread.bat - call thread.bat - @del thread.bat - -toolbar: - @echo cd toolbar >toolbar.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>toolbar.bat - call toolbar.bat - @del toolbar.bat - -treectrl: - @echo cd treectrl >treectrl.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>treectrl.bat - call treectrl.bat - @del treectrl.bat - -typetest: - @echo cd typetest >typetest.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>typetest.bat - call typetest.bat - @del typetest.bat - -validate: - @echo cd validate >validate.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>validate.bat - call validate.bat - @del validate.bat - -vscroll: - @echo cd vscroll >vscroll.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>vscroll.bat - call vscroll.bat - @del vscroll.bat - -widgets: - @echo cd widgets >widgets.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>widgets.bat - call widgets.bat - @del widgets.bat - -wizard: - @echo cd wizard >wizard.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>wizard.bat - call wizard.bat - @del wizard.bat - -wrapsizer: - @echo cd wrapsizer >wrapsizer.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>wrapsizer.bat - call wrapsizer.bat - @del wrapsizer.bat - -xrc: - @echo cd xrc >xrc.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>xrc.bat - call xrc.bat - @del xrc.bat - -memcheck: - @echo cd memcheck >memcheck.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>memcheck.bat - call memcheck.bat - @del memcheck.bat - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +.autodepend + +!ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../build/msw/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ + -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \ + -DCPP="$(CPP)" -DSHARED="$(SHARED)" -DWXUNIV="$(WXUNIV)" \ + -DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" -DBUILD="$(BUILD)" \ + -DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \ + -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \ + -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \ + -DUSE_AUI="$(USE_AUI)" -DUSE_RIBBON="$(USE_RIBBON)" \ + -DUSE_PROPGRID="$(USE_PROPGRID)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \ + -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \ + -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \ + -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \ + -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \ + -DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \ + -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \ + -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" + +### Conditionally set variables: ### + + + +### Targets: ### + +all: access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power printing propgrid regtest render ribbon richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer xrc + +clean: + -if exist .\*.obj del .\*.obj + -if exist .\*.res del .\*.res + -if exist .\*.csm del .\*.csm + @echo cd access >access.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>access.bat + call access.bat + @del access.bat + @echo cd animate >animate.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>animate.bat + call animate.bat + @del animate.bat + @echo cd artprov >artprov.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>artprov.bat + call artprov.bat + @del artprov.bat + @echo cd aui >aui.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>aui.bat + call aui.bat + @del aui.bat + @echo cd calendar >calendar.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>calendar.bat + call calendar.bat + @del calendar.bat + @echo cd caret >caret.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>caret.bat + call caret.bat + @del caret.bat + @echo cd clipboard >clipboard.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>clipboard.bat + call clipboard.bat + @del clipboard.bat + @echo cd collpane >collpane.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>collpane.bat + call collpane.bat + @del collpane.bat + @echo cd combo >combo.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>combo.bat + call combo.bat + @del combo.bat + @echo cd config >config.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>config.bat + call config.bat + @del config.bat + @echo cd console >console.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>console.bat + call console.bat + @del console.bat + @echo cd controls >controls.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>controls.bat + call controls.bat + @del controls.bat + @echo cd dataview >dataview.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>dataview.bat + call dataview.bat + @del dataview.bat + @echo cd dialogs >dialogs.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>dialogs.bat + call dialogs.bat + @del dialogs.bat + @echo cd dialup >dialup.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>dialup.bat + call dialup.bat + @del dialup.bat + @echo cd display >display.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>display.bat + call display.bat + @del display.bat + @echo cd dnd >dnd.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>dnd.bat + call dnd.bat + @del dnd.bat + @echo cd docview >docview.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>docview.bat + call docview.bat + @del docview.bat + @echo cd dragimag >dragimag.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>dragimag.bat + call dragimag.bat + @del dragimag.bat + @echo cd drawing >drawing.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>drawing.bat + call drawing.bat + @del drawing.bat + @echo cd erase >erase.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>erase.bat + call erase.bat + @del erase.bat + @echo cd event >event.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>event.bat + call event.bat + @del event.bat + @echo cd except >except.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>except.bat + call except.bat + @del except.bat + @echo cd exec >exec.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>exec.bat + call exec.bat + @del exec.bat + @echo cd font >font.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>font.bat + call font.bat + @del font.bat + @echo cd grid >grid.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>grid.bat + call grid.bat + @del grid.bat + @echo cd help >help.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>help.bat + call help.bat + @del help.bat + @echo cd htlbox >htlbox.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>htlbox.bat + call htlbox.bat + @del htlbox.bat + @echo cd html >html.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>html.bat + call html.bat + @del html.bat + @echo cd image >image.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>image.bat + call image.bat + @del image.bat + @echo cd internat >internat.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>internat.bat + call internat.bat + @del internat.bat + @echo cd ipc >ipc.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>ipc.bat + call ipc.bat + @del ipc.bat + @echo cd joytest >joytest.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>joytest.bat + call joytest.bat + @del joytest.bat + @echo cd keyboard >keyboard.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>keyboard.bat + call keyboard.bat + @del keyboard.bat + @echo cd layout >layout.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>layout.bat + call layout.bat + @del layout.bat + @echo cd listctrl >listctrl.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>listctrl.bat + call listctrl.bat + @del listctrl.bat + @echo cd mdi >mdi.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>mdi.bat + call mdi.bat + @del mdi.bat + @echo cd mediaplayer >mediaplayer.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>mediaplayer.bat + call mediaplayer.bat + @del mediaplayer.bat + @echo cd menu >menu.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>menu.bat + call menu.bat + @del menu.bat + @echo cd minimal >minimal.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>minimal.bat + call minimal.bat + @del minimal.bat + @echo cd nativdlg >nativdlg.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>nativdlg.bat + call nativdlg.bat + @del nativdlg.bat + @echo cd notebook >notebook.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>notebook.bat + call notebook.bat + @del notebook.bat + @echo cd oleauto >oleauto.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>oleauto.bat + call oleauto.bat + @del oleauto.bat + @echo cd opengl >opengl.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>opengl.bat + call opengl.bat + @del opengl.bat + @echo cd ownerdrw >ownerdrw.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>ownerdrw.bat + call ownerdrw.bat + @del ownerdrw.bat + @echo cd popup >popup.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>popup.bat + call popup.bat + @del popup.bat + @echo cd power >power.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>power.bat + call power.bat + @del power.bat + @echo cd printing >printing.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>printing.bat + call printing.bat + @del printing.bat + @echo cd propgrid >propgrid.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>propgrid.bat + call propgrid.bat + @del propgrid.bat + @echo cd regtest >regtest.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>regtest.bat + call regtest.bat + @del regtest.bat + @echo cd render >render.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>render.bat + call render.bat + @del render.bat + @echo cd ribbon >ribbon.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>ribbon.bat + call ribbon.bat + @del ribbon.bat + @echo cd richtext >richtext.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>richtext.bat + call richtext.bat + @del richtext.bat + @echo cd sashtest >sashtest.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>sashtest.bat + call sashtest.bat + @del sashtest.bat + @echo cd scroll >scroll.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>scroll.bat + call scroll.bat + @del scroll.bat + @echo cd shaped >shaped.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>shaped.bat + call shaped.bat + @del shaped.bat + @echo cd sockets >sockets.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>sockets.bat + call sockets.bat + @del sockets.bat + @echo cd sound >sound.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>sound.bat + call sound.bat + @del sound.bat + @echo cd splash >splash.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>splash.bat + call splash.bat + @del splash.bat + @echo cd splitter >splitter.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>splitter.bat + call splitter.bat + @del splitter.bat + @echo cd statbar >statbar.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>statbar.bat + call statbar.bat + @del statbar.bat + @echo cd stc >stc.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>stc.bat + call stc.bat + @del stc.bat + @echo cd svg >svg.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>svg.bat + call svg.bat + @del svg.bat + @echo cd taborder >taborder.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>taborder.bat + call taborder.bat + @del taborder.bat + @echo cd taskbar >taskbar.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>taskbar.bat + call taskbar.bat + @del taskbar.bat + @echo cd text >text.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>text.bat + call text.bat + @del text.bat + @echo cd thread >thread.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>thread.bat + call thread.bat + @del thread.bat + @echo cd toolbar >toolbar.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>toolbar.bat + call toolbar.bat + @del toolbar.bat + @echo cd treectrl >treectrl.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>treectrl.bat + call treectrl.bat + @del treectrl.bat + @echo cd typetest >typetest.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>typetest.bat + call typetest.bat + @del typetest.bat + @echo cd validate >validate.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>validate.bat + call validate.bat + @del validate.bat + @echo cd vscroll >vscroll.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>vscroll.bat + call vscroll.bat + @del vscroll.bat + @echo cd widgets >widgets.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>widgets.bat + call widgets.bat + @del widgets.bat + @echo cd wizard >wizard.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>wizard.bat + call wizard.bat + @del wizard.bat + @echo cd wrapsizer >wrapsizer.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>wrapsizer.bat + call wrapsizer.bat + @del wrapsizer.bat + @echo cd xrc >xrc.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>xrc.bat + call xrc.bat + @del xrc.bat + @echo cd memcheck >memcheck.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>memcheck.bat + call memcheck.bat + @del memcheck.bat + +access: + @echo cd access >access.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>access.bat + call access.bat + @del access.bat + +animate: + @echo cd animate >animate.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>animate.bat + call animate.bat + @del animate.bat + +artprov: + @echo cd artprov >artprov.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>artprov.bat + call artprov.bat + @del artprov.bat + +aui: + @echo cd aui >aui.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>aui.bat + call aui.bat + @del aui.bat + +calendar: + @echo cd calendar >calendar.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>calendar.bat + call calendar.bat + @del calendar.bat + +caret: + @echo cd caret >caret.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>caret.bat + call caret.bat + @del caret.bat + +clipboard: + @echo cd clipboard >clipboard.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>clipboard.bat + call clipboard.bat + @del clipboard.bat + +collpane: + @echo cd collpane >collpane.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>collpane.bat + call collpane.bat + @del collpane.bat + +combo: + @echo cd combo >combo.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>combo.bat + call combo.bat + @del combo.bat + +config: + @echo cd config >config.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>config.bat + call config.bat + @del config.bat + +console: + @echo cd console >console.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>console.bat + call console.bat + @del console.bat + +controls: + @echo cd controls >controls.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>controls.bat + call controls.bat + @del controls.bat + +dataview: + @echo cd dataview >dataview.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>dataview.bat + call dataview.bat + @del dataview.bat + +dialogs: + @echo cd dialogs >dialogs.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>dialogs.bat + call dialogs.bat + @del dialogs.bat + +dialup: + @echo cd dialup >dialup.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>dialup.bat + call dialup.bat + @del dialup.bat + +display: + @echo cd display >display.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>display.bat + call display.bat + @del display.bat + +dnd: + @echo cd dnd >dnd.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>dnd.bat + call dnd.bat + @del dnd.bat + +docview: + @echo cd docview >docview.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>docview.bat + call docview.bat + @del docview.bat + +dragimag: + @echo cd dragimag >dragimag.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>dragimag.bat + call dragimag.bat + @del dragimag.bat + +drawing: + @echo cd drawing >drawing.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>drawing.bat + call drawing.bat + @del drawing.bat + +erase: + @echo cd erase >erase.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>erase.bat + call erase.bat + @del erase.bat + +event: + @echo cd event >event.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>event.bat + call event.bat + @del event.bat + +except: + @echo cd except >except.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>except.bat + call except.bat + @del except.bat + +exec: + @echo cd exec >exec.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>exec.bat + call exec.bat + @del exec.bat + +font: + @echo cd font >font.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>font.bat + call font.bat + @del font.bat + +grid: + @echo cd grid >grid.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>grid.bat + call grid.bat + @del grid.bat + +help: + @echo cd help >help.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>help.bat + call help.bat + @del help.bat + +htlbox: + @echo cd htlbox >htlbox.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>htlbox.bat + call htlbox.bat + @del htlbox.bat + +html: + @echo cd html >html.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>html.bat + call html.bat + @del html.bat + +image: + @echo cd image >image.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>image.bat + call image.bat + @del image.bat + +internat: + @echo cd internat >internat.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>internat.bat + call internat.bat + @del internat.bat + +ipc: + @echo cd ipc >ipc.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>ipc.bat + call ipc.bat + @del ipc.bat + +joytest: + @echo cd joytest >joytest.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>joytest.bat + call joytest.bat + @del joytest.bat + +keyboard: + @echo cd keyboard >keyboard.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>keyboard.bat + call keyboard.bat + @del keyboard.bat + +layout: + @echo cd layout >layout.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>layout.bat + call layout.bat + @del layout.bat + +listctrl: + @echo cd listctrl >listctrl.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>listctrl.bat + call listctrl.bat + @del listctrl.bat + +mdi: + @echo cd mdi >mdi.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>mdi.bat + call mdi.bat + @del mdi.bat + +mediaplayer: + @echo cd mediaplayer >mediaplayer.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>mediaplayer.bat + call mediaplayer.bat + @del mediaplayer.bat + +menu: + @echo cd menu >menu.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>menu.bat + call menu.bat + @del menu.bat + +minimal: + @echo cd minimal >minimal.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>minimal.bat + call minimal.bat + @del minimal.bat + +nativdlg: + @echo cd nativdlg >nativdlg.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>nativdlg.bat + call nativdlg.bat + @del nativdlg.bat + +notebook: + @echo cd notebook >notebook.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>notebook.bat + call notebook.bat + @del notebook.bat + +oleauto: + @echo cd oleauto >oleauto.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>oleauto.bat + call oleauto.bat + @del oleauto.bat + +opengl: + @echo cd opengl >opengl.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>opengl.bat + call opengl.bat + @del opengl.bat + +ownerdrw: + @echo cd ownerdrw >ownerdrw.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>ownerdrw.bat + call ownerdrw.bat + @del ownerdrw.bat + +popup: + @echo cd popup >popup.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>popup.bat + call popup.bat + @del popup.bat + +power: + @echo cd power >power.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>power.bat + call power.bat + @del power.bat + +printing: + @echo cd printing >printing.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>printing.bat + call printing.bat + @del printing.bat + +propgrid: + @echo cd propgrid >propgrid.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>propgrid.bat + call propgrid.bat + @del propgrid.bat + +regtest: + @echo cd regtest >regtest.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>regtest.bat + call regtest.bat + @del regtest.bat + +render: + @echo cd render >render.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>render.bat + call render.bat + @del render.bat + +ribbon: + @echo cd ribbon >ribbon.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>ribbon.bat + call ribbon.bat + @del ribbon.bat + +richtext: + @echo cd richtext >richtext.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>richtext.bat + call richtext.bat + @del richtext.bat + +sashtest: + @echo cd sashtest >sashtest.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>sashtest.bat + call sashtest.bat + @del sashtest.bat + +scroll: + @echo cd scroll >scroll.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>scroll.bat + call scroll.bat + @del scroll.bat + +shaped: + @echo cd shaped >shaped.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>shaped.bat + call shaped.bat + @del shaped.bat + +sockets: + @echo cd sockets >sockets.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>sockets.bat + call sockets.bat + @del sockets.bat + +sound: + @echo cd sound >sound.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>sound.bat + call sound.bat + @del sound.bat + +splash: + @echo cd splash >splash.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>splash.bat + call splash.bat + @del splash.bat + +splitter: + @echo cd splitter >splitter.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>splitter.bat + call splitter.bat + @del splitter.bat + +statbar: + @echo cd statbar >statbar.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>statbar.bat + call statbar.bat + @del statbar.bat + +stc: + @echo cd stc >stc.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>stc.bat + call stc.bat + @del stc.bat + +svg: + @echo cd svg >svg.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>svg.bat + call svg.bat + @del svg.bat + +taborder: + @echo cd taborder >taborder.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>taborder.bat + call taborder.bat + @del taborder.bat + +taskbar: + @echo cd taskbar >taskbar.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>taskbar.bat + call taskbar.bat + @del taskbar.bat + +text: + @echo cd text >text.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>text.bat + call text.bat + @del text.bat + +thread: + @echo cd thread >thread.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>thread.bat + call thread.bat + @del thread.bat + +toolbar: + @echo cd toolbar >toolbar.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>toolbar.bat + call toolbar.bat + @del toolbar.bat + +treectrl: + @echo cd treectrl >treectrl.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>treectrl.bat + call treectrl.bat + @del treectrl.bat + +typetest: + @echo cd typetest >typetest.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>typetest.bat + call typetest.bat + @del typetest.bat + +validate: + @echo cd validate >validate.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>validate.bat + call validate.bat + @del validate.bat + +vscroll: + @echo cd vscroll >vscroll.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>vscroll.bat + call vscroll.bat + @del vscroll.bat + +widgets: + @echo cd widgets >widgets.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>widgets.bat + call widgets.bat + @del widgets.bat + +wizard: + @echo cd wizard >wizard.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>wizard.bat + call wizard.bat + @del wizard.bat + +wrapsizer: + @echo cd wrapsizer >wrapsizer.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>wrapsizer.bat + call wrapsizer.bat + @del wrapsizer.bat + +xrc: + @echo cd xrc >xrc.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>xrc.bat + call xrc.bat + @del xrc.bat + +memcheck: + @echo cd memcheck >memcheck.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>memcheck.bat + call memcheck.bat + @del memcheck.bat + diff --git a/samples/makefile.gcc b/samples/makefile.gcc index 7ca2de6c8d..e52eadc1ad 100644 --- a/samples/makefile.gcc +++ b/samples/makefile.gcc @@ -1,366 +1,366 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -include ../build/msw/config.gcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ - LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \ - CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ - LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" WXUNIV="$(WXUNIV)" \ - UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \ - DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \ - MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ - USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \ - USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \ - USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \ - USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ - USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \ - USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \ - OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \ - WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ - CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ - RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)" - -### Conditionally set variables: ### - - - -### Targets: ### - -all: access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power printing propgrid regtest render ribbon richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer xrc - -clean: - -if exist .\*.o del .\*.o - -if exist .\*.d del .\*.d - $(MAKE) -C access -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C animate -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C artprov -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C aui -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C calendar -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C caret -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C clipboard -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C collpane -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C combo -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C config -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C console -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C controls -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C dataview -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C dialogs -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C dialup -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C display -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C dnd -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C docview -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C dragimag -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C drawing -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C erase -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C event -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C except -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C exec -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C font -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C grid -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C help -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C htlbox -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C html -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C image -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C internat -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C ipc -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C joytest -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C keyboard -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C layout -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C listctrl -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C mdi -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C mediaplayer -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C menu -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C minimal -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C nativdlg -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C notebook -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C oleauto -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C opengl -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C ownerdrw -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C popup -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C power -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C propgrid -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C regtest -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C render -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C ribbon -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C richtext -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C sashtest -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C scroll -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C shaped -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C sockets -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C sound -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C splash -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C splitter -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C statbar -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C stc -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C svg -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C taborder -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C taskbar -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C text -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C thread -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C toolbar -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C treectrl -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C typetest -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C validate -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C vscroll -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C xrc -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) clean - -access: - $(MAKE) -C access -f makefile.gcc $(MAKEARGS) all - -animate: - $(MAKE) -C animate -f makefile.gcc $(MAKEARGS) all - -artprov: - $(MAKE) -C artprov -f makefile.gcc $(MAKEARGS) all - -aui: - $(MAKE) -C aui -f makefile.gcc $(MAKEARGS) all - -calendar: - $(MAKE) -C calendar -f makefile.gcc $(MAKEARGS) all - -caret: - $(MAKE) -C caret -f makefile.gcc $(MAKEARGS) all - -clipboard: - $(MAKE) -C clipboard -f makefile.gcc $(MAKEARGS) all - -collpane: - $(MAKE) -C collpane -f makefile.gcc $(MAKEARGS) all - -combo: - $(MAKE) -C combo -f makefile.gcc $(MAKEARGS) all - -config: - $(MAKE) -C config -f makefile.gcc $(MAKEARGS) all - -console: - $(MAKE) -C console -f makefile.gcc $(MAKEARGS) all - -controls: - $(MAKE) -C controls -f makefile.gcc $(MAKEARGS) all - -dataview: - $(MAKE) -C dataview -f makefile.gcc $(MAKEARGS) all - -dialogs: - $(MAKE) -C dialogs -f makefile.gcc $(MAKEARGS) all - -dialup: - $(MAKE) -C dialup -f makefile.gcc $(MAKEARGS) all - -display: - $(MAKE) -C display -f makefile.gcc $(MAKEARGS) all - -dnd: - $(MAKE) -C dnd -f makefile.gcc $(MAKEARGS) all - -docview: - $(MAKE) -C docview -f makefile.gcc $(MAKEARGS) all - -dragimag: - $(MAKE) -C dragimag -f makefile.gcc $(MAKEARGS) all - -drawing: - $(MAKE) -C drawing -f makefile.gcc $(MAKEARGS) all - -erase: - $(MAKE) -C erase -f makefile.gcc $(MAKEARGS) all - -event: - $(MAKE) -C event -f makefile.gcc $(MAKEARGS) all - -except: - $(MAKE) -C except -f makefile.gcc $(MAKEARGS) all - -exec: - $(MAKE) -C exec -f makefile.gcc $(MAKEARGS) all - -font: - $(MAKE) -C font -f makefile.gcc $(MAKEARGS) all - -grid: - $(MAKE) -C grid -f makefile.gcc $(MAKEARGS) all - -help: - $(MAKE) -C help -f makefile.gcc $(MAKEARGS) all - -htlbox: - $(MAKE) -C htlbox -f makefile.gcc $(MAKEARGS) all - -html: - $(MAKE) -C html -f makefile.gcc $(MAKEARGS) all - -image: - $(MAKE) -C image -f makefile.gcc $(MAKEARGS) all - -internat: - $(MAKE) -C internat -f makefile.gcc $(MAKEARGS) all - -ipc: - $(MAKE) -C ipc -f makefile.gcc $(MAKEARGS) all - -joytest: - $(MAKE) -C joytest -f makefile.gcc $(MAKEARGS) all - -keyboard: - $(MAKE) -C keyboard -f makefile.gcc $(MAKEARGS) all - -layout: - $(MAKE) -C layout -f makefile.gcc $(MAKEARGS) all - -listctrl: - $(MAKE) -C listctrl -f makefile.gcc $(MAKEARGS) all - -mdi: - $(MAKE) -C mdi -f makefile.gcc $(MAKEARGS) all - -mediaplayer: - $(MAKE) -C mediaplayer -f makefile.gcc $(MAKEARGS) all - -menu: - $(MAKE) -C menu -f makefile.gcc $(MAKEARGS) all - -minimal: - $(MAKE) -C minimal -f makefile.gcc $(MAKEARGS) all - -nativdlg: - $(MAKE) -C nativdlg -f makefile.gcc $(MAKEARGS) all - -notebook: - $(MAKE) -C notebook -f makefile.gcc $(MAKEARGS) all - -oleauto: - $(MAKE) -C oleauto -f makefile.gcc $(MAKEARGS) all - -opengl: - $(MAKE) -C opengl -f makefile.gcc $(MAKEARGS) all - -ownerdrw: - $(MAKE) -C ownerdrw -f makefile.gcc $(MAKEARGS) all - -popup: - $(MAKE) -C popup -f makefile.gcc $(MAKEARGS) all - -power: - $(MAKE) -C power -f makefile.gcc $(MAKEARGS) all - -printing: - $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) all - -propgrid: - $(MAKE) -C propgrid -f makefile.gcc $(MAKEARGS) all - -regtest: - $(MAKE) -C regtest -f makefile.gcc $(MAKEARGS) all - -render: - $(MAKE) -C render -f makefile.gcc $(MAKEARGS) all - -ribbon: - $(MAKE) -C ribbon -f makefile.gcc $(MAKEARGS) all - -richtext: - $(MAKE) -C richtext -f makefile.gcc $(MAKEARGS) all - -sashtest: - $(MAKE) -C sashtest -f makefile.gcc $(MAKEARGS) all - -scroll: - $(MAKE) -C scroll -f makefile.gcc $(MAKEARGS) all - -shaped: - $(MAKE) -C shaped -f makefile.gcc $(MAKEARGS) all - -sockets: - $(MAKE) -C sockets -f makefile.gcc $(MAKEARGS) all - -sound: - $(MAKE) -C sound -f makefile.gcc $(MAKEARGS) all - -splash: - $(MAKE) -C splash -f makefile.gcc $(MAKEARGS) all - -splitter: - $(MAKE) -C splitter -f makefile.gcc $(MAKEARGS) all - -statbar: - $(MAKE) -C statbar -f makefile.gcc $(MAKEARGS) all - -stc: - $(MAKE) -C stc -f makefile.gcc $(MAKEARGS) all - -svg: - $(MAKE) -C svg -f makefile.gcc $(MAKEARGS) all - -taborder: - $(MAKE) -C taborder -f makefile.gcc $(MAKEARGS) all - -taskbar: - $(MAKE) -C taskbar -f makefile.gcc $(MAKEARGS) all - -text: - $(MAKE) -C text -f makefile.gcc $(MAKEARGS) all - -thread: - $(MAKE) -C thread -f makefile.gcc $(MAKEARGS) all - -toolbar: - $(MAKE) -C toolbar -f makefile.gcc $(MAKEARGS) all - -treectrl: - $(MAKE) -C treectrl -f makefile.gcc $(MAKEARGS) all - -typetest: - $(MAKE) -C typetest -f makefile.gcc $(MAKEARGS) all - -validate: - $(MAKE) -C validate -f makefile.gcc $(MAKEARGS) all - -vscroll: - $(MAKE) -C vscroll -f makefile.gcc $(MAKEARGS) all - -widgets: - $(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) all - -wizard: - $(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) all - -wrapsizer: - $(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) all - -xrc: - $(MAKE) -C xrc -f makefile.gcc $(MAKEARGS) all - -memcheck: - $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) all - -.PHONY: all clean access animate artprov aui calendar caret clipboard collpane combo \ - config console controls dataview dialogs dialup display dnd docview dragimag \ - drawing erase event except exec font grid help htlbox html image internat ipc joytest \ - keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto \ - opengl ownerdrw popup power printing propgrid regtest render ribbon richtext \ - sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder \ - taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard \ - wrapsizer xrc memcheck - - -SHELL := $(COMSPEC) - -# Dependencies tracking: --include ./*.d +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../build/msw/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ + LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \ + CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ + LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" WXUNIV="$(WXUNIV)" \ + UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \ + DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \ + MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ + USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \ + USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \ + USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \ + USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ + USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \ + USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \ + OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \ + WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ + CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ + RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)" + +### Conditionally set variables: ### + + + +### Targets: ### + +all: access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power printing propgrid regtest render ribbon richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer xrc + +clean: + -if exist .\*.o del .\*.o + -if exist .\*.d del .\*.d + $(MAKE) -C access -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C animate -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C artprov -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C aui -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C calendar -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C caret -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C clipboard -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C collpane -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C combo -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C config -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C console -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C controls -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C dataview -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C dialogs -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C dialup -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C display -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C dnd -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C docview -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C dragimag -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C drawing -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C erase -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C event -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C except -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C exec -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C font -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C grid -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C help -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C htlbox -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C html -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C image -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C internat -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C ipc -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C joytest -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C keyboard -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C layout -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C listctrl -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C mdi -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C mediaplayer -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C menu -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C minimal -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C nativdlg -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C notebook -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C oleauto -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C opengl -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C ownerdrw -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C popup -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C power -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C propgrid -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C regtest -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C render -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C ribbon -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C richtext -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C sashtest -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C scroll -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C shaped -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C sockets -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C sound -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C splash -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C splitter -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C statbar -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C stc -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C svg -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C taborder -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C taskbar -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C text -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C thread -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C toolbar -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C treectrl -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C typetest -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C validate -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C vscroll -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C xrc -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) clean + +access: + $(MAKE) -C access -f makefile.gcc $(MAKEARGS) all + +animate: + $(MAKE) -C animate -f makefile.gcc $(MAKEARGS) all + +artprov: + $(MAKE) -C artprov -f makefile.gcc $(MAKEARGS) all + +aui: + $(MAKE) -C aui -f makefile.gcc $(MAKEARGS) all + +calendar: + $(MAKE) -C calendar -f makefile.gcc $(MAKEARGS) all + +caret: + $(MAKE) -C caret -f makefile.gcc $(MAKEARGS) all + +clipboard: + $(MAKE) -C clipboard -f makefile.gcc $(MAKEARGS) all + +collpane: + $(MAKE) -C collpane -f makefile.gcc $(MAKEARGS) all + +combo: + $(MAKE) -C combo -f makefile.gcc $(MAKEARGS) all + +config: + $(MAKE) -C config -f makefile.gcc $(MAKEARGS) all + +console: + $(MAKE) -C console -f makefile.gcc $(MAKEARGS) all + +controls: + $(MAKE) -C controls -f makefile.gcc $(MAKEARGS) all + +dataview: + $(MAKE) -C dataview -f makefile.gcc $(MAKEARGS) all + +dialogs: + $(MAKE) -C dialogs -f makefile.gcc $(MAKEARGS) all + +dialup: + $(MAKE) -C dialup -f makefile.gcc $(MAKEARGS) all + +display: + $(MAKE) -C display -f makefile.gcc $(MAKEARGS) all + +dnd: + $(MAKE) -C dnd -f makefile.gcc $(MAKEARGS) all + +docview: + $(MAKE) -C docview -f makefile.gcc $(MAKEARGS) all + +dragimag: + $(MAKE) -C dragimag -f makefile.gcc $(MAKEARGS) all + +drawing: + $(MAKE) -C drawing -f makefile.gcc $(MAKEARGS) all + +erase: + $(MAKE) -C erase -f makefile.gcc $(MAKEARGS) all + +event: + $(MAKE) -C event -f makefile.gcc $(MAKEARGS) all + +except: + $(MAKE) -C except -f makefile.gcc $(MAKEARGS) all + +exec: + $(MAKE) -C exec -f makefile.gcc $(MAKEARGS) all + +font: + $(MAKE) -C font -f makefile.gcc $(MAKEARGS) all + +grid: + $(MAKE) -C grid -f makefile.gcc $(MAKEARGS) all + +help: + $(MAKE) -C help -f makefile.gcc $(MAKEARGS) all + +htlbox: + $(MAKE) -C htlbox -f makefile.gcc $(MAKEARGS) all + +html: + $(MAKE) -C html -f makefile.gcc $(MAKEARGS) all + +image: + $(MAKE) -C image -f makefile.gcc $(MAKEARGS) all + +internat: + $(MAKE) -C internat -f makefile.gcc $(MAKEARGS) all + +ipc: + $(MAKE) -C ipc -f makefile.gcc $(MAKEARGS) all + +joytest: + $(MAKE) -C joytest -f makefile.gcc $(MAKEARGS) all + +keyboard: + $(MAKE) -C keyboard -f makefile.gcc $(MAKEARGS) all + +layout: + $(MAKE) -C layout -f makefile.gcc $(MAKEARGS) all + +listctrl: + $(MAKE) -C listctrl -f makefile.gcc $(MAKEARGS) all + +mdi: + $(MAKE) -C mdi -f makefile.gcc $(MAKEARGS) all + +mediaplayer: + $(MAKE) -C mediaplayer -f makefile.gcc $(MAKEARGS) all + +menu: + $(MAKE) -C menu -f makefile.gcc $(MAKEARGS) all + +minimal: + $(MAKE) -C minimal -f makefile.gcc $(MAKEARGS) all + +nativdlg: + $(MAKE) -C nativdlg -f makefile.gcc $(MAKEARGS) all + +notebook: + $(MAKE) -C notebook -f makefile.gcc $(MAKEARGS) all + +oleauto: + $(MAKE) -C oleauto -f makefile.gcc $(MAKEARGS) all + +opengl: + $(MAKE) -C opengl -f makefile.gcc $(MAKEARGS) all + +ownerdrw: + $(MAKE) -C ownerdrw -f makefile.gcc $(MAKEARGS) all + +popup: + $(MAKE) -C popup -f makefile.gcc $(MAKEARGS) all + +power: + $(MAKE) -C power -f makefile.gcc $(MAKEARGS) all + +printing: + $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) all + +propgrid: + $(MAKE) -C propgrid -f makefile.gcc $(MAKEARGS) all + +regtest: + $(MAKE) -C regtest -f makefile.gcc $(MAKEARGS) all + +render: + $(MAKE) -C render -f makefile.gcc $(MAKEARGS) all + +ribbon: + $(MAKE) -C ribbon -f makefile.gcc $(MAKEARGS) all + +richtext: + $(MAKE) -C richtext -f makefile.gcc $(MAKEARGS) all + +sashtest: + $(MAKE) -C sashtest -f makefile.gcc $(MAKEARGS) all + +scroll: + $(MAKE) -C scroll -f makefile.gcc $(MAKEARGS) all + +shaped: + $(MAKE) -C shaped -f makefile.gcc $(MAKEARGS) all + +sockets: + $(MAKE) -C sockets -f makefile.gcc $(MAKEARGS) all + +sound: + $(MAKE) -C sound -f makefile.gcc $(MAKEARGS) all + +splash: + $(MAKE) -C splash -f makefile.gcc $(MAKEARGS) all + +splitter: + $(MAKE) -C splitter -f makefile.gcc $(MAKEARGS) all + +statbar: + $(MAKE) -C statbar -f makefile.gcc $(MAKEARGS) all + +stc: + $(MAKE) -C stc -f makefile.gcc $(MAKEARGS) all + +svg: + $(MAKE) -C svg -f makefile.gcc $(MAKEARGS) all + +taborder: + $(MAKE) -C taborder -f makefile.gcc $(MAKEARGS) all + +taskbar: + $(MAKE) -C taskbar -f makefile.gcc $(MAKEARGS) all + +text: + $(MAKE) -C text -f makefile.gcc $(MAKEARGS) all + +thread: + $(MAKE) -C thread -f makefile.gcc $(MAKEARGS) all + +toolbar: + $(MAKE) -C toolbar -f makefile.gcc $(MAKEARGS) all + +treectrl: + $(MAKE) -C treectrl -f makefile.gcc $(MAKEARGS) all + +typetest: + $(MAKE) -C typetest -f makefile.gcc $(MAKEARGS) all + +validate: + $(MAKE) -C validate -f makefile.gcc $(MAKEARGS) all + +vscroll: + $(MAKE) -C vscroll -f makefile.gcc $(MAKEARGS) all + +widgets: + $(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) all + +wizard: + $(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) all + +wrapsizer: + $(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) all + +xrc: + $(MAKE) -C xrc -f makefile.gcc $(MAKEARGS) all + +memcheck: + $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) all + +.PHONY: all clean access animate artprov aui calendar caret clipboard collpane combo \ + config console controls dataview dialogs dialup display dnd docview dragimag \ + drawing erase event except exec font grid help htlbox html image internat ipc joytest \ + keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto \ + opengl ownerdrw popup power printing propgrid regtest render ribbon richtext \ + sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder \ + taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard \ + wrapsizer xrc memcheck + + +SHELL := $(COMSPEC) + +# Dependencies tracking: +-include ./*.d diff --git a/samples/makefile.vc b/samples/makefile.vc index 3329498ebf..2f5103f679 100644 --- a/samples/makefile.vc +++ b/samples/makefile.vc @@ -1,676 +1,676 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include <../build/msw/config.vc> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ - CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \ - WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \ - TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \ - DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \ - MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ - USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \ - USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \ - USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \ - USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ - USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \ - USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \ - OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \ - WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ - CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ - RUNTIME_LIBS="$(RUNTIME_LIBS)" - -### Conditionally set variables: ### - - - -### Targets: ### - -all: sub_access sub_animate sub_artprov sub_aui sub_calendar sub_caret sub_clipboard sub_collpane sub_combo sub_config sub_console sub_controls sub_dataview sub_dialogs sub_dialup sub_display sub_dnd sub_docview sub_dragimag sub_drawing sub_erase sub_event sub_except sub_exec sub_font sub_grid sub_help sub_htlbox sub_html sub_image sub_internat sub_ipc sub_joytest sub_keyboard sub_layout sub_listctrl sub_mdi sub_mediaplayer sub_menu sub_minimal sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_popup sub_power sub_printing sub_propgrid sub_regtest sub_render sub_ribbon sub_richtext sub_sashtest sub_scroll sub_shaped sub_sockets sub_sound sub_splash sub_splitter sub_statbar sub_stc sub_svg sub_taborder sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_validate sub_vscroll sub_widgets sub_wizard sub_wrapsizer sub_xrc - -clean: - -if exist .\*.obj del .\*.obj - -if exist .\*.res del .\*.res - -if exist .\*.pch del .\*.pch - cd access - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd animate - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd artprov - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd aui - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd calendar - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd caret - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd clipboard - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd collpane - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd combo - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd config - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd console - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd controls - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd dataview - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd dialogs - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd dialup - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd display - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd dnd - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd docview - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd dragimag - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd drawing - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd erase - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd event - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd except - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd exec - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd font - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd grid - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd help - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd htlbox - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd html - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd image - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd internat - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd ipc - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd joytest - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd keyboard - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd layout - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd listctrl - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd mdi - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd mediaplayer - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd menu - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd minimal - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd nativdlg - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd notebook - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd oleauto - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd opengl - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd ownerdrw - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd popup - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd power - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd printing - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd propgrid - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd regtest - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd render - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd ribbon - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd richtext - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd sashtest - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd scroll - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd shaped - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd sockets - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd sound - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd splash - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd splitter - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd statbar - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd stc - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd svg - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd taborder - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd taskbar - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd text - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd thread - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd toolbar - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd treectrl - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd typetest - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd validate - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd vscroll - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd widgets - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd wizard - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd wrapsizer - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd xrc - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd flash - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd mfc - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd memcheck - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - -sub_access: - cd access - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_animate: - cd animate - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_artprov: - cd artprov - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_aui: - cd aui - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_calendar: - cd calendar - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_caret: - cd caret - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_clipboard: - cd clipboard - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_collpane: - cd collpane - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_combo: - cd combo - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_config: - cd config - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_console: - cd console - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_controls: - cd controls - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_dataview: - cd dataview - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_dialogs: - cd dialogs - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_dialup: - cd dialup - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_display: - cd display - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_dnd: - cd dnd - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_docview: - cd docview - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_dragimag: - cd dragimag - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_drawing: - cd drawing - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_erase: - cd erase - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_event: - cd event - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_except: - cd except - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_exec: - cd exec - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_font: - cd font - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_grid: - cd grid - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_help: - cd help - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_htlbox: - cd htlbox - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_html: - cd html - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_image: - cd image - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_internat: - cd internat - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_ipc: - cd ipc - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_joytest: - cd joytest - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_keyboard: - cd keyboard - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_layout: - cd layout - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_listctrl: - cd listctrl - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_mdi: - cd mdi - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_mediaplayer: - cd mediaplayer - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_menu: - cd menu - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_minimal: - cd minimal - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_nativdlg: - cd nativdlg - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_notebook: - cd notebook - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_oleauto: - cd oleauto - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_opengl: - cd opengl - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_ownerdrw: - cd ownerdrw - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_popup: - cd popup - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_power: - cd power - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_printing: - cd printing - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_propgrid: - cd propgrid - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_regtest: - cd regtest - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_render: - cd render - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_ribbon: - cd ribbon - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_richtext: - cd richtext - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_sashtest: - cd sashtest - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_scroll: - cd scroll - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_shaped: - cd shaped - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_sockets: - cd sockets - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_sound: - cd sound - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_splash: - cd splash - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_splitter: - cd splitter - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_statbar: - cd statbar - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_stc: - cd stc - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_svg: - cd svg - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_taborder: - cd taborder - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_taskbar: - cd taskbar - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_text: - cd text - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_thread: - cd thread - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_toolbar: - cd toolbar - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_treectrl: - cd treectrl - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_typetest: - cd typetest - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_validate: - cd validate - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_vscroll: - cd vscroll - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_widgets: - cd widgets - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_wizard: - cd wizard - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_wrapsizer: - cd wrapsizer - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_xrc: - cd xrc - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_flash: - cd flash - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_mfc: - cd mfc - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_memcheck: - cd memcheck - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ + CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \ + WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \ + TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \ + DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \ + MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ + USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \ + USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \ + USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \ + USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ + USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \ + USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \ + OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \ + WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ + CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ + RUNTIME_LIBS="$(RUNTIME_LIBS)" + +### Conditionally set variables: ### + + + +### Targets: ### + +all: sub_access sub_animate sub_artprov sub_aui sub_calendar sub_caret sub_clipboard sub_collpane sub_combo sub_config sub_console sub_controls sub_dataview sub_dialogs sub_dialup sub_display sub_dnd sub_docview sub_dragimag sub_drawing sub_erase sub_event sub_except sub_exec sub_font sub_grid sub_help sub_htlbox sub_html sub_image sub_internat sub_ipc sub_joytest sub_keyboard sub_layout sub_listctrl sub_mdi sub_mediaplayer sub_menu sub_minimal sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_popup sub_power sub_printing sub_propgrid sub_regtest sub_render sub_ribbon sub_richtext sub_sashtest sub_scroll sub_shaped sub_sockets sub_sound sub_splash sub_splitter sub_statbar sub_stc sub_svg sub_taborder sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_validate sub_vscroll sub_widgets sub_wizard sub_wrapsizer sub_xrc + +clean: + -if exist .\*.obj del .\*.obj + -if exist .\*.res del .\*.res + -if exist .\*.pch del .\*.pch + cd access + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd animate + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd artprov + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd aui + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd calendar + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd caret + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd clipboard + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd collpane + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd combo + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd config + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd console + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd controls + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd dataview + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd dialogs + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd dialup + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd display + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd dnd + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd docview + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd dragimag + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd drawing + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd erase + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd event + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd except + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd exec + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd font + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd grid + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd help + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd htlbox + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd html + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd image + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd internat + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd ipc + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd joytest + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd keyboard + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd layout + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd listctrl + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd mdi + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd mediaplayer + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd menu + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd minimal + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd nativdlg + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd notebook + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd oleauto + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd opengl + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd ownerdrw + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd popup + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd power + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd printing + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd propgrid + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd regtest + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd render + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd ribbon + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd richtext + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd sashtest + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd scroll + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd shaped + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd sockets + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd sound + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd splash + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd splitter + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd statbar + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd stc + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd svg + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd taborder + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd taskbar + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd text + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd thread + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd toolbar + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd treectrl + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd typetest + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd validate + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd vscroll + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd widgets + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd wizard + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd wrapsizer + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd xrc + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd flash + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd mfc + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd memcheck + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + +sub_access: + cd access + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_animate: + cd animate + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_artprov: + cd artprov + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_aui: + cd aui + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_calendar: + cd calendar + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_caret: + cd caret + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_clipboard: + cd clipboard + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_collpane: + cd collpane + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_combo: + cd combo + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_config: + cd config + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_console: + cd console + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_controls: + cd controls + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_dataview: + cd dataview + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_dialogs: + cd dialogs + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_dialup: + cd dialup + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_display: + cd display + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_dnd: + cd dnd + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_docview: + cd docview + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_dragimag: + cd dragimag + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_drawing: + cd drawing + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_erase: + cd erase + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_event: + cd event + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_except: + cd except + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_exec: + cd exec + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_font: + cd font + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_grid: + cd grid + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_help: + cd help + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_htlbox: + cd htlbox + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_html: + cd html + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_image: + cd image + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_internat: + cd internat + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_ipc: + cd ipc + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_joytest: + cd joytest + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_keyboard: + cd keyboard + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_layout: + cd layout + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_listctrl: + cd listctrl + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_mdi: + cd mdi + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_mediaplayer: + cd mediaplayer + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_menu: + cd menu + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_minimal: + cd minimal + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_nativdlg: + cd nativdlg + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_notebook: + cd notebook + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_oleauto: + cd oleauto + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_opengl: + cd opengl + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_ownerdrw: + cd ownerdrw + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_popup: + cd popup + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_power: + cd power + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_printing: + cd printing + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_propgrid: + cd propgrid + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_regtest: + cd regtest + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_render: + cd render + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_ribbon: + cd ribbon + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_richtext: + cd richtext + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_sashtest: + cd sashtest + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_scroll: + cd scroll + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_shaped: + cd shaped + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_sockets: + cd sockets + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_sound: + cd sound + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_splash: + cd splash + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_splitter: + cd splitter + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_statbar: + cd statbar + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_stc: + cd stc + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_svg: + cd svg + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_taborder: + cd taborder + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_taskbar: + cd taskbar + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_text: + cd text + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_thread: + cd thread + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_toolbar: + cd toolbar + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_treectrl: + cd treectrl + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_typetest: + cd typetest + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_validate: + cd validate + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_vscroll: + cd vscroll + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_widgets: + cd widgets + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_wizard: + cd wizard + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_wrapsizer: + cd wrapsizer + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_xrc: + cd xrc + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_flash: + cd flash + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_mfc: + cd mfc + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_memcheck: + cd memcheck + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + diff --git a/samples/makefile.wat b/samples/makefile.wat index 25d3fdebeb..ba6fcc6e56 100644 --- a/samples/makefile.wat +++ b/samples/makefile.wat @@ -1,680 +1,680 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - - -### Variables: ### - -MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & - CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" & - WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" & - DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" & - MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" & - USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" & - USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" & - USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" & - USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" & - USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" & - USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" & - OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" & - WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" & - CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" & - RUNTIME_LIBS="$(RUNTIME_LIBS)" - - -### Targets: ### - -all : .SYMBOLIC access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power printing propgrid regtest render ribbon richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer xrc - -clean : .SYMBOLIC - -if exist .\*.obj del .\*.obj - -if exist .\*.res del .\*.res - -if exist .\*.lbc del .\*.lbc - -if exist .\*.ilk del .\*.ilk - -if exist .\*.pch del .\*.pch - cd access - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd animate - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd artprov - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd aui - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd calendar - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd caret - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd clipboard - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd collpane - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd combo - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd config - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd console - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd controls - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd dataview - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd dialogs - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd dialup - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd display - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd dnd - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd docview - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd dragimag - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd drawing - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd erase - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd event - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd except - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd exec - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd font - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd grid - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd help - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd htlbox - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd html - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd image - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd internat - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd ipc - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd joytest - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd keyboard - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd layout - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd listctrl - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd mdi - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd mediaplayer - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd menu - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd minimal - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd nativdlg - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd notebook - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd oleauto - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd opengl - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd ownerdrw - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd popup - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd power - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd printing - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd propgrid - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd regtest - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd render - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd ribbon - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd richtext - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd sashtest - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd scroll - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd shaped - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd sockets - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd sound - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd splash - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd splitter - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd statbar - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd stc - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd svg - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd taborder - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd taskbar - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd text - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd thread - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd toolbar - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd treectrl - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd typetest - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd validate - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd vscroll - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd widgets - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd wizard - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd wrapsizer - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd xrc - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd memcheck - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - -access : .SYMBOLIC - cd access - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -animate : .SYMBOLIC - cd animate - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -artprov : .SYMBOLIC - cd artprov - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -aui : .SYMBOLIC - cd aui - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -calendar : .SYMBOLIC - cd calendar - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -caret : .SYMBOLIC - cd caret - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -clipboard : .SYMBOLIC - cd clipboard - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -collpane : .SYMBOLIC - cd collpane - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -combo : .SYMBOLIC - cd combo - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -config : .SYMBOLIC - cd config - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -console : .SYMBOLIC - cd console - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -controls : .SYMBOLIC - cd controls - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -dataview : .SYMBOLIC - cd dataview - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -dialogs : .SYMBOLIC - cd dialogs - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -dialup : .SYMBOLIC - cd dialup - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -display : .SYMBOLIC - cd display - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -dnd : .SYMBOLIC - cd dnd - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -docview : .SYMBOLIC - cd docview - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -dragimag : .SYMBOLIC - cd dragimag - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -drawing : .SYMBOLIC - cd drawing - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -erase : .SYMBOLIC - cd erase - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -event : .SYMBOLIC - cd event - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -except : .SYMBOLIC - cd except - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -exec : .SYMBOLIC - cd exec - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -font : .SYMBOLIC - cd font - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -grid : .SYMBOLIC - cd grid - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -help : .SYMBOLIC - cd help - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -htlbox : .SYMBOLIC - cd htlbox - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -html : .SYMBOLIC - cd html - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -image : .SYMBOLIC - cd image - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -internat : .SYMBOLIC - cd internat - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -ipc : .SYMBOLIC - cd ipc - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -joytest : .SYMBOLIC - cd joytest - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -keyboard : .SYMBOLIC - cd keyboard - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -layout : .SYMBOLIC - cd layout - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -listctrl : .SYMBOLIC - cd listctrl - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -mdi : .SYMBOLIC - cd mdi - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -mediaplayer : .SYMBOLIC - cd mediaplayer - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -menu : .SYMBOLIC - cd menu - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -minimal : .SYMBOLIC - cd minimal - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -nativdlg : .SYMBOLIC - cd nativdlg - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -notebook : .SYMBOLIC - cd notebook - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -oleauto : .SYMBOLIC - cd oleauto - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -opengl : .SYMBOLIC - cd opengl - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -ownerdrw : .SYMBOLIC - cd ownerdrw - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -popup : .SYMBOLIC - cd popup - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -power : .SYMBOLIC - cd power - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -printing : .SYMBOLIC - cd printing - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -propgrid : .SYMBOLIC - cd propgrid - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -regtest : .SYMBOLIC - cd regtest - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -render : .SYMBOLIC - cd render - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -ribbon : .SYMBOLIC - cd ribbon - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -richtext : .SYMBOLIC - cd richtext - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -sashtest : .SYMBOLIC - cd sashtest - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -scroll : .SYMBOLIC - cd scroll - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -shaped : .SYMBOLIC - cd shaped - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -sockets : .SYMBOLIC - cd sockets - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -sound : .SYMBOLIC - cd sound - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -splash : .SYMBOLIC - cd splash - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -splitter : .SYMBOLIC - cd splitter - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -statbar : .SYMBOLIC - cd statbar - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -stc : .SYMBOLIC - cd stc - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -svg : .SYMBOLIC - cd svg - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -taborder : .SYMBOLIC - cd taborder - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -taskbar : .SYMBOLIC - cd taskbar - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -text : .SYMBOLIC - cd text - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -thread : .SYMBOLIC - cd thread - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -toolbar : .SYMBOLIC - cd toolbar - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -treectrl : .SYMBOLIC - cd treectrl - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -typetest : .SYMBOLIC - cd typetest - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -validate : .SYMBOLIC - cd validate - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -vscroll : .SYMBOLIC - cd vscroll - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -widgets : .SYMBOLIC - cd widgets - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -wizard : .SYMBOLIC - cd wizard - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -wrapsizer : .SYMBOLIC - cd wrapsizer - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -xrc : .SYMBOLIC - cd xrc - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -memcheck : .SYMBOLIC - cd memcheck - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + + +### Variables: ### + +MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & + CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" & + WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" & + DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" & + MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" & + USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" & + USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" & + USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" & + USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" & + USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" & + USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" & + OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" & + WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" & + CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" & + RUNTIME_LIBS="$(RUNTIME_LIBS)" + + +### Targets: ### + +all : .SYMBOLIC access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power printing propgrid regtest render ribbon richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer xrc + +clean : .SYMBOLIC + -if exist .\*.obj del .\*.obj + -if exist .\*.res del .\*.res + -if exist .\*.lbc del .\*.lbc + -if exist .\*.ilk del .\*.ilk + -if exist .\*.pch del .\*.pch + cd access + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd animate + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd artprov + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd aui + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd calendar + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd caret + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd clipboard + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd collpane + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd combo + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd config + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd console + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd controls + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd dataview + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd dialogs + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd dialup + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd display + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd dnd + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd docview + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd dragimag + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd drawing + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd erase + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd event + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd except + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd exec + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd font + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd grid + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd help + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd htlbox + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd html + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd image + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd internat + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd ipc + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd joytest + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd keyboard + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd layout + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd listctrl + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd mdi + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd mediaplayer + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd menu + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd minimal + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd nativdlg + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd notebook + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd oleauto + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd opengl + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd ownerdrw + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd popup + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd power + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd printing + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd propgrid + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd regtest + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd render + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd ribbon + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd richtext + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd sashtest + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd scroll + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd shaped + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd sockets + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd sound + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd splash + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd splitter + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd statbar + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd stc + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd svg + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd taborder + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd taskbar + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd text + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd thread + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd toolbar + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd treectrl + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd typetest + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd validate + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd vscroll + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd widgets + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd wizard + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd wrapsizer + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd xrc + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd memcheck + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + +access : .SYMBOLIC + cd access + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +animate : .SYMBOLIC + cd animate + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +artprov : .SYMBOLIC + cd artprov + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +aui : .SYMBOLIC + cd aui + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +calendar : .SYMBOLIC + cd calendar + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +caret : .SYMBOLIC + cd caret + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +clipboard : .SYMBOLIC + cd clipboard + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +collpane : .SYMBOLIC + cd collpane + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +combo : .SYMBOLIC + cd combo + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +config : .SYMBOLIC + cd config + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +console : .SYMBOLIC + cd console + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +controls : .SYMBOLIC + cd controls + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +dataview : .SYMBOLIC + cd dataview + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +dialogs : .SYMBOLIC + cd dialogs + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +dialup : .SYMBOLIC + cd dialup + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +display : .SYMBOLIC + cd display + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +dnd : .SYMBOLIC + cd dnd + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +docview : .SYMBOLIC + cd docview + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +dragimag : .SYMBOLIC + cd dragimag + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +drawing : .SYMBOLIC + cd drawing + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +erase : .SYMBOLIC + cd erase + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +event : .SYMBOLIC + cd event + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +except : .SYMBOLIC + cd except + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +exec : .SYMBOLIC + cd exec + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +font : .SYMBOLIC + cd font + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +grid : .SYMBOLIC + cd grid + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +help : .SYMBOLIC + cd help + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +htlbox : .SYMBOLIC + cd htlbox + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +html : .SYMBOLIC + cd html + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +image : .SYMBOLIC + cd image + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +internat : .SYMBOLIC + cd internat + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +ipc : .SYMBOLIC + cd ipc + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +joytest : .SYMBOLIC + cd joytest + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +keyboard : .SYMBOLIC + cd keyboard + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +layout : .SYMBOLIC + cd layout + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +listctrl : .SYMBOLIC + cd listctrl + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +mdi : .SYMBOLIC + cd mdi + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +mediaplayer : .SYMBOLIC + cd mediaplayer + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +menu : .SYMBOLIC + cd menu + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +minimal : .SYMBOLIC + cd minimal + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +nativdlg : .SYMBOLIC + cd nativdlg + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +notebook : .SYMBOLIC + cd notebook + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +oleauto : .SYMBOLIC + cd oleauto + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +opengl : .SYMBOLIC + cd opengl + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +ownerdrw : .SYMBOLIC + cd ownerdrw + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +popup : .SYMBOLIC + cd popup + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +power : .SYMBOLIC + cd power + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +printing : .SYMBOLIC + cd printing + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +propgrid : .SYMBOLIC + cd propgrid + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +regtest : .SYMBOLIC + cd regtest + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +render : .SYMBOLIC + cd render + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +ribbon : .SYMBOLIC + cd ribbon + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +richtext : .SYMBOLIC + cd richtext + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +sashtest : .SYMBOLIC + cd sashtest + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +scroll : .SYMBOLIC + cd scroll + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +shaped : .SYMBOLIC + cd shaped + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +sockets : .SYMBOLIC + cd sockets + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +sound : .SYMBOLIC + cd sound + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +splash : .SYMBOLIC + cd splash + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +splitter : .SYMBOLIC + cd splitter + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +statbar : .SYMBOLIC + cd statbar + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +stc : .SYMBOLIC + cd stc + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +svg : .SYMBOLIC + cd svg + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +taborder : .SYMBOLIC + cd taborder + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +taskbar : .SYMBOLIC + cd taskbar + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +text : .SYMBOLIC + cd text + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +thread : .SYMBOLIC + cd thread + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +toolbar : .SYMBOLIC + cd toolbar + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +treectrl : .SYMBOLIC + cd treectrl + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +typetest : .SYMBOLIC + cd typetest + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +validate : .SYMBOLIC + cd validate + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +vscroll : .SYMBOLIC + cd vscroll + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +widgets : .SYMBOLIC + cd widgets + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +wizard : .SYMBOLIC + cd wizard + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +wrapsizer : .SYMBOLIC + cd wrapsizer + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +xrc : .SYMBOLIC + cd xrc + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +memcheck : .SYMBOLIC + cd memcheck + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + diff --git a/samples/mdi/Makefile.in b/samples/mdi/Makefile.in index fe8b693f31..a9b18949fb 100644 --- a/samples/mdi/Makefile.in +++ b/samples/mdi/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/mdi/makefile.bcc b/samples/mdi/makefile.bcc index de521aebb6..6bb65e99fd 100644 --- a/samples/mdi/makefile.bcc +++ b/samples/mdi/makefile.bcc @@ -1,232 +1,232 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -.autodepend - -!ifndef BCCDIR -!ifndef MAKEDIR -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif -BCCDIR = $(MAKEDIR)\.. -!endif - -!include ../../build/msw/config.bcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = bcc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -MDI_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \ - -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS) -MDI_OBJECTS = \ - $(OBJS)\mdi_mdi.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_2 = -Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_2 = -O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_5 = -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_5 = mt -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_6 = -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_6 = -tWM -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_7 = -tWR -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_7 = -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = i -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = -DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = -dwxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = -DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = -dwxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = -D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = -d_UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = -DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = -dWXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = -v -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = -v- -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO = -v- -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO = -v -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\mdi.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.csm del $(OBJS)\*.csm - -if exist $(OBJS)\mdi.exe del $(OBJS)\mdi.exe - -if exist $(OBJS)\mdi.tds del $(OBJS)\mdi.tds - -if exist $(OBJS)\mdi.ilc del $(OBJS)\mdi.ilc - -if exist $(OBJS)\mdi.ild del $(OBJS)\mdi.ild - -if exist $(OBJS)\mdi.ilf del $(OBJS)\mdi.ilf - -if exist $(OBJS)\mdi.ils del $(OBJS)\mdi.ils - -$(OBJS)\mdi.exe: $(MDI_OBJECTS) $(OBJS)\mdi_mdi.res - ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| - c0w32.obj $(MDI_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\mdi_mdi.res -| - -$(OBJS)\mdi_mdi.obj: .\mdi.cpp - $(CXX) -q -c -P -o$@ $(MDI_CXXFLAGS) .\mdi.cpp - -$(OBJS)\mdi_mdi.res: .\mdi.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\mdi.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +.autodepend + +!ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../build/msw/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = bcc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +MDI_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \ + -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS) +MDI_OBJECTS = \ + $(OBJS)\mdi_mdi.obj + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_5 = +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_5 = mt +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_6 = +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_6 = -tWM +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_8 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_8 = +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = -DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = -dwxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = -DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = -dwxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -d_UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = -v +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\mdi.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.csm del $(OBJS)\*.csm + -if exist $(OBJS)\mdi.exe del $(OBJS)\mdi.exe + -if exist $(OBJS)\mdi.tds del $(OBJS)\mdi.tds + -if exist $(OBJS)\mdi.ilc del $(OBJS)\mdi.ilc + -if exist $(OBJS)\mdi.ild del $(OBJS)\mdi.ild + -if exist $(OBJS)\mdi.ilf del $(OBJS)\mdi.ilf + -if exist $(OBJS)\mdi.ils del $(OBJS)\mdi.ils + +$(OBJS)\mdi.exe: $(MDI_OBJECTS) $(OBJS)\mdi_mdi.res + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| + c0w32.obj $(MDI_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\mdi_mdi.res +| + +$(OBJS)\mdi_mdi.obj: .\mdi.cpp + $(CXX) -q -c -P -o$@ $(MDI_CXXFLAGS) .\mdi.cpp + +$(OBJS)\mdi_mdi.res: .\mdi.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\mdi.rc + diff --git a/samples/mdi/makefile.gcc b/samples/mdi/makefile.gcc index 4ee7eac23a..6846b7b2db 100644 --- a/samples/mdi/makefile.gcc +++ b/samples/mdi/makefile.gcc @@ -1,226 +1,226 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -include ../../build/msw/config.gcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -CPPDEPS = -MT$@ -MF$@.d -MD -MP -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = gcc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -MDI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \ - -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \ - $(CPPFLAGS) $(CXXFLAGS) -MDI_OBJECTS = \ - $(OBJS)\mdi_mdi.o \ - $(OBJS)\mdi_mdi_rc.o - -### Conditionally set variables: ### - -ifeq ($(GCC_VERSION),2.95) -GCCFLAGS = -fvtable-thunks -endif -ifeq ($(USE_GUI),0) -PORTNAME = base -endif -ifeq ($(USE_GUI),1) -PORTNAME = msw -endif -ifeq ($(BUILD),debug) -WXDEBUGFLAG = d -endif -ifeq ($(UNICODE),1) -WXUNICODEFLAG = u -endif -ifeq ($(WXUNIV),1) -WXUNIVNAME = univ -endif -ifeq ($(SHARED),1) -WXDLLFLAG = dll -endif -ifeq ($(SHARED),0) -LIBTYPE_SUFFIX = lib -endif -ifeq ($(SHARED),1) -LIBTYPE_SUFFIX = dll -endif -ifeq ($(MONOLITHIC),0) -EXTRALIBS_FOR_BASE = -endif -ifeq ($(MONOLITHIC),1) -EXTRALIBS_FOR_BASE = -endif -ifeq ($(BUILD),debug) -__OPTIMIZEFLAG_2 = -O0 -endif -ifeq ($(BUILD),release) -__OPTIMIZEFLAG_2 = -O2 -endif -ifeq ($(USE_RTTI),0) -__RTTIFLAG_5 = -fno-rtti -endif -ifeq ($(USE_RTTI),1) -__RTTIFLAG_5 = -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONSFLAG_6 = -fno-exceptions -endif -ifeq ($(USE_EXCEPTIONS),1) -__EXCEPTIONSFLAG_6 = -endif -ifeq ($(WXUNIV),1) -__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -endif -ifeq ($(WXUNIV),1) -__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ -endif -ifeq ($(DEBUG_FLAG),0) -__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -endif -ifeq ($(DEBUG_FLAG),0) -__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS -endif -ifeq ($(USE_RTTI),0) -__RTTI_DEFINE_p = -DwxNO_RTTI -endif -ifeq ($(USE_RTTI),0) -__RTTI_DEFINE_p_1 = --define wxNO_RTTI -endif -ifeq ($(USE_THREADS),0) -__THREAD_DEFINE_p = -DwxNO_THREADS -endif -ifeq ($(USE_THREADS),0) -__THREAD_DEFINE_p_1 = --define wxNO_THREADS -endif -ifeq ($(UNICODE),0) -__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 -endif -ifeq ($(UNICODE),1) -__UNICODE_DEFINE_p = -D_UNICODE -endif -ifeq ($(UNICODE),0) -__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0 -endif -ifeq ($(UNICODE),1) -__UNICODE_DEFINE_p_1 = --define _UNICODE -endif -ifeq ($(MSLU),1) -__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 -endif -ifeq ($(MSLU),1) -__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1 -endif -ifeq ($(USE_GDIPLUS),1) -__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1 -endif -ifeq ($(USE_GDIPLUS),1) -__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1 -endif -ifeq ($(SHARED),1) -__DLLFLAG_p = -DWXUSINGDLL -endif -ifeq ($(SHARED),1) -__DLLFLAG_p_1 = --define WXUSINGDLL -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_CORE_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_BASE_p = \ - -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -endif -ifeq ($(MONOLITHIC),1) -__WXLIB_MONO_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -endif -ifeq ($(USE_GUI),1) -__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -endif -ifeq ($(USE_GUI),1) -__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -endif -ifeq ($(USE_GUI),1) -__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -endif -ifeq ($(MSLU),1) -__UNICOWS_LIB_p = -lunicows -endif -ifeq ($(USE_GDIPLUS),1) -__GDIPLUS_LIB_p = -lgdiplus -endif -ifeq ($(BUILD),debug) -ifeq ($(DEBUG_INFO),default) -__DEBUGINFO = -g -endif -endif -ifeq ($(BUILD),release) -ifeq ($(DEBUG_INFO),default) -__DEBUGINFO = -endif -endif -ifeq ($(DEBUG_INFO),0) -__DEBUGINFO = -endif -ifeq ($(DEBUG_INFO),1) -__DEBUGINFO = -g -endif -ifeq ($(USE_THREADS),0) -__THREADSFLAG = -endif -ifeq ($(USE_THREADS),1) -__THREADSFLAG = -mthreads -endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\mdi.exe - -clean: - -if exist $(OBJS)\*.o del $(OBJS)\*.o - -if exist $(OBJS)\*.d del $(OBJS)\*.d - -if exist $(OBJS)\mdi.exe del $(OBJS)\mdi.exe - -$(OBJS)\mdi.exe: $(MDI_OBJECTS) $(OBJS)\mdi_mdi_rc.o - $(CXX) -o $@ $(MDI_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet - -$(OBJS)\mdi_mdi.o: ./mdi.cpp - $(CXX) -c -o $@ $(MDI_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\mdi_mdi_rc.o: ./mdi.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH - -.PHONY: all clean - - -SHELL := $(COMSPEC) - -# Dependencies tracking: --include $(OBJS)/*.d +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../build/msw/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +CPPDEPS = -MT$@ -MF$@.d -MD -MP +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = gcc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +MDI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \ + -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \ + $(CPPFLAGS) $(CXXFLAGS) +MDI_OBJECTS = \ + $(OBJS)\mdi_mdi.o \ + $(OBJS)\mdi_mdi_rc.o + +### Conditionally set variables: ### + +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif +ifeq ($(USE_GUI),0) +PORTNAME = base +endif +ifeq ($(USE_GUI),1) +PORTNAME = msw +endif +ifeq ($(BUILD),debug) +WXDEBUGFLAG = d +endif +ifeq ($(UNICODE),1) +WXUNICODEFLAG = u +endif +ifeq ($(WXUNIV),1) +WXUNIVNAME = univ +endif +ifeq ($(SHARED),1) +WXDLLFLAG = dll +endif +ifeq ($(SHARED),0) +LIBTYPE_SUFFIX = lib +endif +ifeq ($(SHARED),1) +LIBTYPE_SUFFIX = dll +endif +ifeq ($(MONOLITHIC),0) +EXTRALIBS_FOR_BASE = +endif +ifeq ($(MONOLITHIC),1) +EXTRALIBS_FOR_BASE = +endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif +ifeq ($(USE_RTTI),0) +__RTTIFLAG_5 = -fno-rtti +endif +ifeq ($(USE_RTTI),1) +__RTTIFLAG_5 = +endif +ifeq ($(USE_EXCEPTIONS),0) +__EXCEPTIONSFLAG_6 = -fno-exceptions +endif +ifeq ($(USE_EXCEPTIONS),1) +__EXCEPTIONSFLAG_6 = +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ +endif +ifeq ($(DEBUG_FLAG),0) +__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 +endif +ifeq ($(DEBUG_FLAG),0) +__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 +endif +ifeq ($(USE_EXCEPTIONS),0) +__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS +endif +ifeq ($(USE_EXCEPTIONS),0) +__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS +endif +ifeq ($(USE_RTTI),0) +__RTTI_DEFINE_p = -DwxNO_RTTI +endif +ifeq ($(USE_RTTI),0) +__RTTI_DEFINE_p_1 = --define wxNO_RTTI +endif +ifeq ($(USE_THREADS),0) +__THREAD_DEFINE_p = -DwxNO_THREADS +endif +ifeq ($(USE_THREADS),0) +__THREAD_DEFINE_p_1 = --define wxNO_THREADS +endif +ifeq ($(UNICODE),0) +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -D_UNICODE +endif +ifeq ($(UNICODE),0) +__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p_1 = --define _UNICODE +endif +ifeq ($(MSLU),1) +__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 +endif +ifeq ($(MSLU),1) +__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1 +endif +ifeq ($(USE_GDIPLUS),1) +__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1 +endif +ifeq ($(USE_GDIPLUS),1) +__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1 +endif +ifeq ($(SHARED),1) +__DLLFLAG_p = -DWXUSINGDLL +endif +ifeq ($(SHARED),1) +__DLLFLAG_p_1 = --define WXUSINGDLL +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = \ + -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) +endif +ifeq ($(MONOLITHIC),1) +__WXLIB_MONO_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) +endif +ifeq ($(USE_GUI),1) +__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +endif +ifeq ($(MSLU),1) +__UNICOWS_LIB_p = -lunicows +endif +ifeq ($(USE_GDIPLUS),1) +__GDIPLUS_LIB_p = -lgdiplus +endif +ifeq ($(BUILD),debug) +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = -g +endif +endif +ifeq ($(BUILD),release) +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = +endif +endif +ifeq ($(DEBUG_INFO),0) +__DEBUGINFO = +endif +ifeq ($(DEBUG_INFO),1) +__DEBUGINFO = -g +endif +ifeq ($(USE_THREADS),0) +__THREADSFLAG = +endif +ifeq ($(USE_THREADS),1) +__THREADSFLAG = -mthreads +endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\mdi.exe + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -if exist $(OBJS)\*.d del $(OBJS)\*.d + -if exist $(OBJS)\mdi.exe del $(OBJS)\mdi.exe + +$(OBJS)\mdi.exe: $(MDI_OBJECTS) $(OBJS)\mdi_mdi_rc.o + $(CXX) -o $@ $(MDI_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet + +$(OBJS)\mdi_mdi.o: ./mdi.cpp + $(CXX) -c -o $@ $(MDI_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\mdi_mdi_rc.o: ./mdi.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH + +.PHONY: all clean + + +SHELL := $(COMSPEC) + +# Dependencies tracking: +-include $(OBJS)/*.d diff --git a/samples/mdi/makefile.unx b/samples/mdi/makefile.unx index 2dc22a4cd3..eabe74ec96 100644 --- a/samples/mdi/makefile.unx +++ b/samples/mdi/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/mdi/makefile.vc b/samples/mdi/makefile.vc index 89a2175088..4e758f64de 100644 --- a/samples/mdi/makefile.vc +++ b/samples/mdi/makefile.vc @@ -1,311 +1,336 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include <../../build/msw/config.vc> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -MDI_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\mdi.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -MDI_OBJECTS = \ - $(OBJS)\mdi_mdi.obj \ - $(OBJS)\mdi_mdi.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\mdi.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\mdi.exe del $(OBJS)\mdi.exe - -if exist $(OBJS)\mdi.ilk del $(OBJS)\mdi.ilk - -if exist $(OBJS)\mdi.pdb del $(OBJS)\mdi.pdb - -$(OBJS)\mdi.exe: $(MDI_OBJECTS) $(OBJS)\mdi_mdi.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\mdi.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(MDI_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\mdi_mdi.obj: .\mdi.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MDI_CXXFLAGS) .\mdi.cpp - -$(OBJS)\mdi_mdi.res: .\mdi.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\mdi.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +MDI_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\mdi.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +MDI_OBJECTS = \ + $(OBJS)\mdi_mdi.obj +MDI_RESOURCES = \ + $(OBJS)\mdi_mdi.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\mdi.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\mdi.exe del $(OBJS)\mdi.exe + -if exist $(OBJS)\mdi.ilk del $(OBJS)\mdi.ilk + -if exist $(OBJS)\mdi.pdb del $(OBJS)\mdi.pdb + +$(OBJS)\mdi.exe: $(MDI_OBJECTS) $(OBJS)\mdi_mdi.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\mdi.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(MDI_OBJECTS) $(MDI_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\mdi_mdi.obj: .\mdi.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MDI_CXXFLAGS) .\mdi.cpp + +$(OBJS)\mdi_mdi.res: .\mdi.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\mdi.rc + diff --git a/samples/mdi/makefile.wat b/samples/mdi/makefile.wat index 5cb18c42f8..1cf8ad7a9e 100644 --- a/samples/mdi/makefile.wat +++ b/samples/mdi/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -MDI_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -MDI_OBJECTS = & - $(OBJS)\mdi_mdi.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\mdi.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\mdi.exe del $(OBJS)\mdi.exe - -$(OBJS)\mdi.exe : $(MDI_OBJECTS) $(OBJS)\mdi_mdi.res - @%create $(OBJS)\mdi.lbc - @%append $(OBJS)\mdi.lbc option quiet - @%append $(OBJS)\mdi.lbc name $^@ - @%append $(OBJS)\mdi.lbc option caseexact - @%append $(OBJS)\mdi.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(MDI_OBJECTS)) do @%append $(OBJS)\mdi.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\mdi.lbc library %i - @%append $(OBJS)\mdi.lbc option resource=$(OBJS)\mdi_mdi.res - @for %i in () do @%append $(OBJS)\mdi.lbc option stack=%i - wlink @$(OBJS)\mdi.lbc - -$(OBJS)\mdi_mdi.obj : .AUTODEPEND .\mdi.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MDI_CXXFLAGS) $< - -$(OBJS)\mdi_mdi.res : .AUTODEPEND .\mdi.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +MDI_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +MDI_OBJECTS = & + $(OBJS)\mdi_mdi.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\mdi.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\mdi.exe del $(OBJS)\mdi.exe + +$(OBJS)\mdi.exe : $(MDI_OBJECTS) $(OBJS)\mdi_mdi.res + @%create $(OBJS)\mdi.lbc + @%append $(OBJS)\mdi.lbc option quiet + @%append $(OBJS)\mdi.lbc name $^@ + @%append $(OBJS)\mdi.lbc option caseexact + @%append $(OBJS)\mdi.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(MDI_OBJECTS)) do @%append $(OBJS)\mdi.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\mdi.lbc library %i + @%append $(OBJS)\mdi.lbc option resource=$(OBJS)\mdi_mdi.res + @for %i in () do @%append $(OBJS)\mdi.lbc option stack=%i + wlink @$(OBJS)\mdi.lbc + +$(OBJS)\mdi_mdi.obj : .AUTODEPEND .\mdi.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MDI_CXXFLAGS) $< + +$(OBJS)\mdi_mdi.res : .AUTODEPEND .\mdi.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/mdi/mdi.dsp b/samples/mdi/mdi.dsp index 1cba09c735..959aea7384 100644 --- a/samples/mdi/mdi.dsp +++ b/samples/mdi/mdi.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\mdi" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\mdi.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\mdi.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\mdi.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\mdi.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\mdi" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\mdi.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\mdi.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\mdi.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\mdi.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\mdi" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\mdi.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\mdi.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\mdi.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\mdi.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\mdi" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\mdi.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\mdi.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\mdi.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\mdi.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/mdi/mdi_vc7.vcproj b/samples/mdi/mdi_vc7.vcproj index 71286774e7..2277115c28 100644 --- a/samples/mdi/mdi_vc7.vcproj +++ b/samples/mdi/mdi_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\mdi.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\mdi.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\mdi.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\mdi.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\mdi.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\mdi.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\mdi.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\mdi.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\mdi.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\mdi.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\mdi.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\mdi.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -MEDIAPLAYER_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\mediaplayer.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -MEDIAPLAYER_OBJECTS = \ - $(OBJS)\mediaplayer_sample.res \ - $(OBJS)\mediaplayer_mediaplayer.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" && "$(USE_MEDIA)" == "1" -__WXLIB_MEDIA_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\mediaplayer.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\mediaplayer.exe del $(OBJS)\mediaplayer.exe - -if exist $(OBJS)\mediaplayer.ilk del $(OBJS)\mediaplayer.ilk - -if exist $(OBJS)\mediaplayer.pdb del $(OBJS)\mediaplayer.pdb - -$(OBJS)\mediaplayer.exe: $(MEDIAPLAYER_OBJECTS) $(OBJS)\mediaplayer_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\mediaplayer.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(MEDIAPLAYER_OBJECTS) $(__WXLIB_MEDIA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\mediaplayer_sample.res: .\..\..\samples\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc - -$(OBJS)\mediaplayer_mediaplayer.obj: .\mediaplayer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MEDIAPLAYER_CXXFLAGS) .\mediaplayer.cpp - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +MEDIAPLAYER_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\mediaplayer.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +MEDIAPLAYER_OBJECTS = \ + $(OBJS)\mediaplayer_mediaplayer.obj +MEDIAPLAYER_RESOURCES = \ + $(OBJS)\mediaplayer_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" && "$(USE_MEDIA)" == "1" +__WXLIB_MEDIA_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\mediaplayer.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\mediaplayer.exe del $(OBJS)\mediaplayer.exe + -if exist $(OBJS)\mediaplayer.ilk del $(OBJS)\mediaplayer.ilk + -if exist $(OBJS)\mediaplayer.pdb del $(OBJS)\mediaplayer.pdb + +$(OBJS)\mediaplayer.exe: $(MEDIAPLAYER_OBJECTS) $(OBJS)\mediaplayer_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\mediaplayer.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(MEDIAPLAYER_OBJECTS) $(MEDIAPLAYER_RESOURCES) $(__WXLIB_MEDIA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\mediaplayer_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + +$(OBJS)\mediaplayer_mediaplayer.obj: .\mediaplayer.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MEDIAPLAYER_CXXFLAGS) .\mediaplayer.cpp + diff --git a/samples/mediaplayer/makefile.wat b/samples/mediaplayer/makefile.wat index 6f737fb85d..1cf7a1aa64 100644 --- a/samples/mediaplayer/makefile.wat +++ b/samples/mediaplayer/makefile.wat @@ -1,267 +1,267 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_MEDIA_p = -!ifeq MONOLITHIC 0 -!ifeq USE_MEDIA 1 -__WXLIB_MEDIA_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib -!endif -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -MEDIAPLAYER_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -MEDIAPLAYER_OBJECTS = & - $(OBJS)\mediaplayer_mediaplayer.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\mediaplayer.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\mediaplayer.exe del $(OBJS)\mediaplayer.exe - -$(OBJS)\mediaplayer.exe : $(MEDIAPLAYER_OBJECTS) $(OBJS)\mediaplayer_sample.res - @%create $(OBJS)\mediaplayer.lbc - @%append $(OBJS)\mediaplayer.lbc option quiet - @%append $(OBJS)\mediaplayer.lbc name $^@ - @%append $(OBJS)\mediaplayer.lbc option caseexact - @%append $(OBJS)\mediaplayer.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(MEDIAPLAYER_OBJECTS)) do @%append $(OBJS)\mediaplayer.lbc file %i - @for %i in ( $(__WXLIB_MEDIA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\mediaplayer.lbc library %i - @%append $(OBJS)\mediaplayer.lbc option resource=$(OBJS)\mediaplayer_sample.res - @for %i in () do @%append $(OBJS)\mediaplayer.lbc option stack=%i - wlink @$(OBJS)\mediaplayer.lbc - -$(OBJS)\mediaplayer_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - -$(OBJS)\mediaplayer_mediaplayer.obj : .AUTODEPEND .\mediaplayer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MEDIAPLAYER_CXXFLAGS) $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_MEDIA_p = +!ifeq MONOLITHIC 0 +!ifeq USE_MEDIA 1 +__WXLIB_MEDIA_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib +!endif +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +MEDIAPLAYER_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +MEDIAPLAYER_OBJECTS = & + $(OBJS)\mediaplayer_mediaplayer.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\mediaplayer.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\mediaplayer.exe del $(OBJS)\mediaplayer.exe + +$(OBJS)\mediaplayer.exe : $(MEDIAPLAYER_OBJECTS) $(OBJS)\mediaplayer_sample.res + @%create $(OBJS)\mediaplayer.lbc + @%append $(OBJS)\mediaplayer.lbc option quiet + @%append $(OBJS)\mediaplayer.lbc name $^@ + @%append $(OBJS)\mediaplayer.lbc option caseexact + @%append $(OBJS)\mediaplayer.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(MEDIAPLAYER_OBJECTS)) do @%append $(OBJS)\mediaplayer.lbc file %i + @for %i in ( $(__WXLIB_MEDIA_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\mediaplayer.lbc library %i + @%append $(OBJS)\mediaplayer.lbc option resource=$(OBJS)\mediaplayer_sample.res + @for %i in () do @%append $(OBJS)\mediaplayer.lbc option stack=%i + wlink @$(OBJS)\mediaplayer.lbc + +$(OBJS)\mediaplayer_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + +$(OBJS)\mediaplayer_mediaplayer.obj : .AUTODEPEND .\mediaplayer.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MEDIAPLAYER_CXXFLAGS) $< + diff --git a/samples/mediaplayer/mediaplayer.dsp b/samples/mediaplayer/mediaplayer.dsp index af56903d54..a12401418b 100644 --- a/samples/mediaplayer/mediaplayer.dsp +++ b/samples/mediaplayer/mediaplayer.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\mediaplayer" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\mediaplayer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\mediaplayer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\mediaplayer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\mediaplayer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\mediaplayer" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\mediaplayer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\mediaplayer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\mediaplayer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\mediaplayer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\mediaplayer" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\mediaplayer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\mediaplayer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\mediaplayer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\mediaplayer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\mediaplayer" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\mediaplayer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\mediaplayer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\mediaplayer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\mediaplayer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/mediaplayer/mediaplayer_vc7.vcproj b/samples/mediaplayer/mediaplayer_vc7.vcproj index 0204f1535b..44f0844e9c 100644 --- a/samples/mediaplayer/mediaplayer_vc7.vcproj +++ b/samples/mediaplayer/mediaplayer_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\mediaplayer.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\mediaplayer.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\mediaplayer.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\mediaplayer.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\mediaplayer.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\mediaplayer.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\mediaplayer.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\mediaplayer.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\mediaplayer.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\mediaplayer.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\mediaplayer.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\mediaplayer.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -MEMCHECK_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\memcheck.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -MEMCHECK_OBJECTS = \ - $(OBJS)\memcheck_memcheck.obj \ - $(OBJS)\memcheck_memcheck.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\memcheck.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\memcheck.exe del $(OBJS)\memcheck.exe - -if exist $(OBJS)\memcheck.ilk del $(OBJS)\memcheck.ilk - -if exist $(OBJS)\memcheck.pdb del $(OBJS)\memcheck.pdb - -$(OBJS)\memcheck.exe: $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_memcheck.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\memcheck.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(MEMCHECK_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\memcheck_memcheck.obj: .\memcheck.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MEMCHECK_CXXFLAGS) .\memcheck.cpp - -$(OBJS)\memcheck_memcheck.res: .\memcheck.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\memcheck.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +MEMCHECK_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\memcheck.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +MEMCHECK_OBJECTS = \ + $(OBJS)\memcheck_memcheck.obj +MEMCHECK_RESOURCES = \ + $(OBJS)\memcheck_memcheck.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\memcheck.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\memcheck.exe del $(OBJS)\memcheck.exe + -if exist $(OBJS)\memcheck.ilk del $(OBJS)\memcheck.ilk + -if exist $(OBJS)\memcheck.pdb del $(OBJS)\memcheck.pdb + +$(OBJS)\memcheck.exe: $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_memcheck.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\memcheck.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(MEMCHECK_OBJECTS) $(MEMCHECK_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\memcheck_memcheck.obj: .\memcheck.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MEMCHECK_CXXFLAGS) .\memcheck.cpp + +$(OBJS)\memcheck_memcheck.res: .\memcheck.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\memcheck.rc + diff --git a/samples/memcheck/makefile.wat b/samples/memcheck/makefile.wat index 9e0c3709ed..f2ac528281 100644 --- a/samples/memcheck/makefile.wat +++ b/samples/memcheck/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -MEMCHECK_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -MEMCHECK_OBJECTS = & - $(OBJS)\memcheck_memcheck.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\memcheck.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\memcheck.exe del $(OBJS)\memcheck.exe - -$(OBJS)\memcheck.exe : $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_memcheck.res - @%create $(OBJS)\memcheck.lbc - @%append $(OBJS)\memcheck.lbc option quiet - @%append $(OBJS)\memcheck.lbc name $^@ - @%append $(OBJS)\memcheck.lbc option caseexact - @%append $(OBJS)\memcheck.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(MEMCHECK_OBJECTS)) do @%append $(OBJS)\memcheck.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\memcheck.lbc library %i - @%append $(OBJS)\memcheck.lbc option resource=$(OBJS)\memcheck_memcheck.res - @for %i in () do @%append $(OBJS)\memcheck.lbc option stack=%i - wlink @$(OBJS)\memcheck.lbc - -$(OBJS)\memcheck_memcheck.obj : .AUTODEPEND .\memcheck.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MEMCHECK_CXXFLAGS) $< - -$(OBJS)\memcheck_memcheck.res : .AUTODEPEND .\memcheck.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +MEMCHECK_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +MEMCHECK_OBJECTS = & + $(OBJS)\memcheck_memcheck.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\memcheck.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\memcheck.exe del $(OBJS)\memcheck.exe + +$(OBJS)\memcheck.exe : $(MEMCHECK_OBJECTS) $(OBJS)\memcheck_memcheck.res + @%create $(OBJS)\memcheck.lbc + @%append $(OBJS)\memcheck.lbc option quiet + @%append $(OBJS)\memcheck.lbc name $^@ + @%append $(OBJS)\memcheck.lbc option caseexact + @%append $(OBJS)\memcheck.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(MEMCHECK_OBJECTS)) do @%append $(OBJS)\memcheck.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\memcheck.lbc library %i + @%append $(OBJS)\memcheck.lbc option resource=$(OBJS)\memcheck_memcheck.res + @for %i in () do @%append $(OBJS)\memcheck.lbc option stack=%i + wlink @$(OBJS)\memcheck.lbc + +$(OBJS)\memcheck_memcheck.obj : .AUTODEPEND .\memcheck.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MEMCHECK_CXXFLAGS) $< + +$(OBJS)\memcheck_memcheck.res : .AUTODEPEND .\memcheck.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/memcheck/memcheck.dsp b/samples/memcheck/memcheck.dsp index 86fb0d00ff..baed90b577 100644 --- a/samples/memcheck/memcheck.dsp +++ b/samples/memcheck/memcheck.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\memcheck" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\memcheck.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\memcheck.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\memcheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\memcheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\memcheck" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\memcheck.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\memcheck.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\memcheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\memcheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\memcheck" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\memcheck.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\memcheck.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\memcheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\memcheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\memcheck" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\memcheck.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\memcheck.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\memcheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\memcheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/memcheck/memcheck_vc7.vcproj b/samples/memcheck/memcheck_vc7.vcproj index 7eca7862f6..06afd21269 100644 --- a/samples/memcheck/memcheck_vc7.vcproj +++ b/samples/memcheck/memcheck_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\memcheck.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\memcheck.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\memcheck.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\memcheck.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\memcheck.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\memcheck.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\memcheck.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\memcheck.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\memcheck.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\memcheck.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\memcheck.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\memcheck.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -MENU_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\menu.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -MENU_OBJECTS = \ - $(OBJS)\menu_menu.obj \ - $(OBJS)\menu_menu.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\menu.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\menu.exe del $(OBJS)\menu.exe - -if exist $(OBJS)\menu.ilk del $(OBJS)\menu.ilk - -if exist $(OBJS)\menu.pdb del $(OBJS)\menu.pdb - -$(OBJS)\menu.exe: $(MENU_OBJECTS) $(OBJS)\menu_menu.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\menu.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(MENU_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\menu_menu.obj: .\menu.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MENU_CXXFLAGS) .\menu.cpp - -$(OBJS)\menu_menu.res: .\menu.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\menu.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +MENU_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\menu.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +MENU_OBJECTS = \ + $(OBJS)\menu_menu.obj +MENU_RESOURCES = \ + $(OBJS)\menu_menu.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\menu.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\menu.exe del $(OBJS)\menu.exe + -if exist $(OBJS)\menu.ilk del $(OBJS)\menu.ilk + -if exist $(OBJS)\menu.pdb del $(OBJS)\menu.pdb + +$(OBJS)\menu.exe: $(MENU_OBJECTS) $(OBJS)\menu_menu.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\menu.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(MENU_OBJECTS) $(MENU_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\menu_menu.obj: .\menu.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MENU_CXXFLAGS) .\menu.cpp + +$(OBJS)\menu_menu.res: .\menu.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\menu.rc + diff --git a/samples/menu/makefile.wat b/samples/menu/makefile.wat index eadce7b85a..3b2bde64e0 100644 --- a/samples/menu/makefile.wat +++ b/samples/menu/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -MENU_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -MENU_OBJECTS = & - $(OBJS)\menu_menu.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\menu.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\menu.exe del $(OBJS)\menu.exe - -$(OBJS)\menu.exe : $(MENU_OBJECTS) $(OBJS)\menu_menu.res - @%create $(OBJS)\menu.lbc - @%append $(OBJS)\menu.lbc option quiet - @%append $(OBJS)\menu.lbc name $^@ - @%append $(OBJS)\menu.lbc option caseexact - @%append $(OBJS)\menu.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(MENU_OBJECTS)) do @%append $(OBJS)\menu.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\menu.lbc library %i - @%append $(OBJS)\menu.lbc option resource=$(OBJS)\menu_menu.res - @for %i in () do @%append $(OBJS)\menu.lbc option stack=%i - wlink @$(OBJS)\menu.lbc - -$(OBJS)\menu_menu.obj : .AUTODEPEND .\menu.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MENU_CXXFLAGS) $< - -$(OBJS)\menu_menu.res : .AUTODEPEND .\menu.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +MENU_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +MENU_OBJECTS = & + $(OBJS)\menu_menu.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\menu.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\menu.exe del $(OBJS)\menu.exe + +$(OBJS)\menu.exe : $(MENU_OBJECTS) $(OBJS)\menu_menu.res + @%create $(OBJS)\menu.lbc + @%append $(OBJS)\menu.lbc option quiet + @%append $(OBJS)\menu.lbc name $^@ + @%append $(OBJS)\menu.lbc option caseexact + @%append $(OBJS)\menu.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(MENU_OBJECTS)) do @%append $(OBJS)\menu.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\menu.lbc library %i + @%append $(OBJS)\menu.lbc option resource=$(OBJS)\menu_menu.res + @for %i in () do @%append $(OBJS)\menu.lbc option stack=%i + wlink @$(OBJS)\menu.lbc + +$(OBJS)\menu_menu.obj : .AUTODEPEND .\menu.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MENU_CXXFLAGS) $< + +$(OBJS)\menu_menu.res : .AUTODEPEND .\menu.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/menu/menu.dsp b/samples/menu/menu.dsp index f7ced8db89..3d6463c58e 100644 --- a/samples/menu/menu.dsp +++ b/samples/menu/menu.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\menu" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\menu.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\menu.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\menu.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\menu.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\menu" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\menu.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\menu.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\menu.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\menu.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\menu" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\menu.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\menu.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\menu.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\menu.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\menu" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\menu.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\menu.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\menu.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\menu.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/menu/menu_vc7.vcproj b/samples/menu/menu_vc7.vcproj index af53d6b505..d7f919e9ee 100644 --- a/samples/menu/menu_vc7.vcproj +++ b/samples/menu/menu_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\menu.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\menu.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\menu.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\menu.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\menu.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\menu.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\menu.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\menu.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\menu.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\menu.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\menu.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\menu.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -MFCTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\mfctest.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -MFCTEST_OBJECTS = \ - $(OBJS)\mfctest_mfctest.obj \ - $(OBJS)\mfctest_mfctest.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\mfctest.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\mfctest.exe del $(OBJS)\mfctest.exe - -if exist $(OBJS)\mfctest.ilk del $(OBJS)\mfctest.ilk - -if exist $(OBJS)\mfctest.pdb del $(OBJS)\mfctest.pdb - -$(OBJS)\mfctest.exe: $(MFCTEST_OBJECTS) $(OBJS)\mfctest_mfctest.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\mfctest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(MFCTEST_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\mfctest_mfctest.obj: .\mfctest.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MFCTEST_CXXFLAGS) .\mfctest.cpp - -$(OBJS)\mfctest_mfctest.res: .\mfctest.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\mfctest.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +MFCTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\mfctest.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +MFCTEST_OBJECTS = \ + $(OBJS)\mfctest_mfctest.obj +MFCTEST_RESOURCES = \ + $(OBJS)\mfctest_mfctest.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\mfctest.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\mfctest.exe del $(OBJS)\mfctest.exe + -if exist $(OBJS)\mfctest.ilk del $(OBJS)\mfctest.ilk + -if exist $(OBJS)\mfctest.pdb del $(OBJS)\mfctest.pdb + +$(OBJS)\mfctest.exe: $(MFCTEST_OBJECTS) $(OBJS)\mfctest_mfctest.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\mfctest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(MFCTEST_OBJECTS) $(MFCTEST_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\mfctest_mfctest.obj: .\mfctest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MFCTEST_CXXFLAGS) .\mfctest.cpp + +$(OBJS)\mfctest_mfctest.res: .\mfctest.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\mfctest.rc + diff --git a/samples/mfc/mfc.dsp b/samples/mfc/mfc.dsp index 53b98e4632..426c08c808 100644 --- a/samples/mfc/mfc.dsp +++ b/samples/mfc/mfc.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\mfctest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\mfctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\mfctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\mfctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\mfctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\mfctest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\mfctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\mfctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\mfctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\mfctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\mfctest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\mfctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\mfctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\mfctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\mfctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\mfctest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\mfctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\mfctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\mfctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\mfctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/mfc/mfc_vc7.vcproj b/samples/mfc/mfc_vc7.vcproj index c8a61311a1..8006f284df 100644 --- a/samples/mfc/mfc_vc7.vcproj +++ b/samples/mfc/mfc_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\mfctest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\mfctest.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\mfctest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\mfctest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\mfctest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\mfctest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\mfctest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\mfctest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\mfctest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\mfctest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\mfctest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\mfctest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -MINIMAL_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\minimal.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -MINIMAL_OBJECTS = \ - $(OBJS)\minimal_sample.res \ - $(OBJS)\minimal_minimal.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\minimal.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\minimal.exe del $(OBJS)\minimal.exe - -if exist $(OBJS)\minimal.ilk del $(OBJS)\minimal.ilk - -if exist $(OBJS)\minimal.pdb del $(OBJS)\minimal.pdb - -$(OBJS)\minimal.exe: $(MINIMAL_OBJECTS) $(OBJS)\minimal_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\minimal.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(MINIMAL_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\minimal_sample.res: .\..\..\samples\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc - -$(OBJS)\minimal_minimal.obj: .\minimal.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MINIMAL_CXXFLAGS) .\minimal.cpp - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +MINIMAL_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\minimal.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +MINIMAL_OBJECTS = \ + $(OBJS)\minimal_minimal.obj +MINIMAL_RESOURCES = \ + $(OBJS)\minimal_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\minimal.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\minimal.exe del $(OBJS)\minimal.exe + -if exist $(OBJS)\minimal.ilk del $(OBJS)\minimal.ilk + -if exist $(OBJS)\minimal.pdb del $(OBJS)\minimal.pdb + +$(OBJS)\minimal.exe: $(MINIMAL_OBJECTS) $(OBJS)\minimal_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\minimal.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(MINIMAL_OBJECTS) $(MINIMAL_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\minimal_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + +$(OBJS)\minimal_minimal.obj: .\minimal.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MINIMAL_CXXFLAGS) .\minimal.cpp + diff --git a/samples/minimal/makefile.wat b/samples/minimal/makefile.wat index 63af18ef15..f45899c248 100644 --- a/samples/minimal/makefile.wat +++ b/samples/minimal/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -MINIMAL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -MINIMAL_OBJECTS = & - $(OBJS)\minimal_minimal.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\minimal.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\minimal.exe del $(OBJS)\minimal.exe - -$(OBJS)\minimal.exe : $(MINIMAL_OBJECTS) $(OBJS)\minimal_sample.res - @%create $(OBJS)\minimal.lbc - @%append $(OBJS)\minimal.lbc option quiet - @%append $(OBJS)\minimal.lbc name $^@ - @%append $(OBJS)\minimal.lbc option caseexact - @%append $(OBJS)\minimal.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(MINIMAL_OBJECTS)) do @%append $(OBJS)\minimal.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\minimal.lbc library %i - @%append $(OBJS)\minimal.lbc option resource=$(OBJS)\minimal_sample.res - @for %i in () do @%append $(OBJS)\minimal.lbc option stack=%i - wlink @$(OBJS)\minimal.lbc - -$(OBJS)\minimal_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - -$(OBJS)\minimal_minimal.obj : .AUTODEPEND .\minimal.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MINIMAL_CXXFLAGS) $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +MINIMAL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +MINIMAL_OBJECTS = & + $(OBJS)\minimal_minimal.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\minimal.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\minimal.exe del $(OBJS)\minimal.exe + +$(OBJS)\minimal.exe : $(MINIMAL_OBJECTS) $(OBJS)\minimal_sample.res + @%create $(OBJS)\minimal.lbc + @%append $(OBJS)\minimal.lbc option quiet + @%append $(OBJS)\minimal.lbc name $^@ + @%append $(OBJS)\minimal.lbc option caseexact + @%append $(OBJS)\minimal.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(MINIMAL_OBJECTS)) do @%append $(OBJS)\minimal.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\minimal.lbc library %i + @%append $(OBJS)\minimal.lbc option resource=$(OBJS)\minimal_sample.res + @for %i in () do @%append $(OBJS)\minimal.lbc option stack=%i + wlink @$(OBJS)\minimal.lbc + +$(OBJS)\minimal_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + +$(OBJS)\minimal_minimal.obj : .AUTODEPEND .\minimal.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MINIMAL_CXXFLAGS) $< + diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp index 80bf766199..d21c2524f3 100644 --- a/samples/minimal/minimal.cpp +++ b/samples/minimal/minimal.cpp @@ -68,6 +68,22 @@ public: void OnQuit(wxCommandEvent& event); void OnAbout(wxCommandEvent& event); + void OnPaint(wxPaintEvent&) + { + wxPaintDC dc(this); + + wxFont font = GetFont(); + + for ( int size = 10; size < 20; size++ ) + { + font.SetPixelSize(wxSize(0, size)); + dc.SetFont(font); + dc.DrawText(wxString::Format("%dpx The quick brown fox jumps over the lazy dog.", size), + 10, 10 + (size - 10)*20); + } + } + + private: // any class wishing to process wxWidgets events must use this macro DECLARE_EVENT_TABLE() @@ -99,6 +115,7 @@ enum BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(Minimal_Quit, MyFrame::OnQuit) EVT_MENU(Minimal_About, MyFrame::OnAbout) + EVT_PAINT(MyFrame::OnPaint) END_EVENT_TABLE() // Create a new application object: this macro will allow wxWidgets to create diff --git a/samples/minimal/minimal.dsp b/samples/minimal/minimal.dsp index c919626bf2..08630b9340 100644 --- a/samples/minimal/minimal.dsp +++ b/samples/minimal/minimal.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\minimal" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\minimal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\minimal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\minimal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\minimal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\minimal" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\minimal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\minimal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\minimal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\minimal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\minimal" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\minimal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\minimal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\minimal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\minimal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\minimal" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\minimal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\minimal.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\minimal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\minimal.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/minimal/minimal_vc7.vcproj b/samples/minimal/minimal_vc7.vcproj index b8d39d1f1e..512e911875 100644 --- a/samples/minimal/minimal_vc7.vcproj +++ b/samples/minimal/minimal_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\minimal.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\minimal.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\minimal.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\minimal.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\minimal.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\minimal.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\minimal.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\minimal.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\minimal.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\minimal.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\minimal.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\minimal.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -NATIVDLG_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\nativdlg.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -NATIVDLG_OBJECTS = \ - $(OBJS)\nativdlg_nativdlg.obj \ - $(OBJS)\nativdlg_nativdlg.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\nativdlg.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\nativdlg.exe del $(OBJS)\nativdlg.exe - -if exist $(OBJS)\nativdlg.ilk del $(OBJS)\nativdlg.ilk - -if exist $(OBJS)\nativdlg.pdb del $(OBJS)\nativdlg.pdb - -$(OBJS)\nativdlg.exe: $(NATIVDLG_OBJECTS) $(OBJS)\nativdlg_nativdlg.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\nativdlg.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(NATIVDLG_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\nativdlg_nativdlg.obj: .\nativdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(NATIVDLG_CXXFLAGS) .\nativdlg.cpp - -$(OBJS)\nativdlg_nativdlg.res: .\nativdlg.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\nativdlg.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +NATIVDLG_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\nativdlg.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +NATIVDLG_OBJECTS = \ + $(OBJS)\nativdlg_nativdlg.obj +NATIVDLG_RESOURCES = \ + $(OBJS)\nativdlg_nativdlg.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\nativdlg.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\nativdlg.exe del $(OBJS)\nativdlg.exe + -if exist $(OBJS)\nativdlg.ilk del $(OBJS)\nativdlg.ilk + -if exist $(OBJS)\nativdlg.pdb del $(OBJS)\nativdlg.pdb + +$(OBJS)\nativdlg.exe: $(NATIVDLG_OBJECTS) $(OBJS)\nativdlg_nativdlg.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\nativdlg.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(NATIVDLG_OBJECTS) $(NATIVDLG_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\nativdlg_nativdlg.obj: .\nativdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NATIVDLG_CXXFLAGS) .\nativdlg.cpp + +$(OBJS)\nativdlg_nativdlg.res: .\nativdlg.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\nativdlg.rc + diff --git a/samples/nativdlg/makefile.wat b/samples/nativdlg/makefile.wat index cd0208e95b..62dc41b9f1 100644 --- a/samples/nativdlg/makefile.wat +++ b/samples/nativdlg/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -NATIVDLG_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -NATIVDLG_OBJECTS = & - $(OBJS)\nativdlg_nativdlg.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\nativdlg.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\nativdlg.exe del $(OBJS)\nativdlg.exe - -$(OBJS)\nativdlg.exe : $(NATIVDLG_OBJECTS) $(OBJS)\nativdlg_nativdlg.res - @%create $(OBJS)\nativdlg.lbc - @%append $(OBJS)\nativdlg.lbc option quiet - @%append $(OBJS)\nativdlg.lbc name $^@ - @%append $(OBJS)\nativdlg.lbc option caseexact - @%append $(OBJS)\nativdlg.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(NATIVDLG_OBJECTS)) do @%append $(OBJS)\nativdlg.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\nativdlg.lbc library %i - @%append $(OBJS)\nativdlg.lbc option resource=$(OBJS)\nativdlg_nativdlg.res - @for %i in () do @%append $(OBJS)\nativdlg.lbc option stack=%i - wlink @$(OBJS)\nativdlg.lbc - -$(OBJS)\nativdlg_nativdlg.obj : .AUTODEPEND .\nativdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NATIVDLG_CXXFLAGS) $< - -$(OBJS)\nativdlg_nativdlg.res : .AUTODEPEND .\nativdlg.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +NATIVDLG_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +NATIVDLG_OBJECTS = & + $(OBJS)\nativdlg_nativdlg.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\nativdlg.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\nativdlg.exe del $(OBJS)\nativdlg.exe + +$(OBJS)\nativdlg.exe : $(NATIVDLG_OBJECTS) $(OBJS)\nativdlg_nativdlg.res + @%create $(OBJS)\nativdlg.lbc + @%append $(OBJS)\nativdlg.lbc option quiet + @%append $(OBJS)\nativdlg.lbc name $^@ + @%append $(OBJS)\nativdlg.lbc option caseexact + @%append $(OBJS)\nativdlg.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(NATIVDLG_OBJECTS)) do @%append $(OBJS)\nativdlg.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\nativdlg.lbc library %i + @%append $(OBJS)\nativdlg.lbc option resource=$(OBJS)\nativdlg_nativdlg.res + @for %i in () do @%append $(OBJS)\nativdlg.lbc option stack=%i + wlink @$(OBJS)\nativdlg.lbc + +$(OBJS)\nativdlg_nativdlg.obj : .AUTODEPEND .\nativdlg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(NATIVDLG_CXXFLAGS) $< + +$(OBJS)\nativdlg_nativdlg.res : .AUTODEPEND .\nativdlg.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/nativdlg/nativdlg.dsp b/samples/nativdlg/nativdlg.dsp index 4ffe35bf40..b2acf1855c 100644 --- a/samples/nativdlg/nativdlg.dsp +++ b/samples/nativdlg/nativdlg.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\nativdlg" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\nativdlg.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\nativdlg.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\nativdlg.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\nativdlg.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\nativdlg" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\nativdlg.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\nativdlg.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\nativdlg.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\nativdlg.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\nativdlg" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\nativdlg.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\nativdlg.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\nativdlg.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\nativdlg.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\nativdlg" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\nativdlg.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\nativdlg.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\nativdlg.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\nativdlg.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/nativdlg/nativdlg_vc7.vcproj b/samples/nativdlg/nativdlg_vc7.vcproj index bf0479a50a..d55b1052cc 100644 --- a/samples/nativdlg/nativdlg_vc7.vcproj +++ b/samples/nativdlg/nativdlg_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\nativdlg.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\nativdlg.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\nativdlg.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\nativdlg.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\nativdlg.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\nativdlg.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\nativdlg.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\nativdlg.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\nativdlg.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\nativdlg.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\nativdlg.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\nativdlg.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -NOTEBOOK_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\notebook.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -NOTEBOOK_OBJECTS = \ - $(OBJS)\notebook_sample.res \ - $(OBJS)\notebook_notebook.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\notebook.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\notebook.exe del $(OBJS)\notebook.exe - -if exist $(OBJS)\notebook.ilk del $(OBJS)\notebook.ilk - -if exist $(OBJS)\notebook.pdb del $(OBJS)\notebook.pdb - -$(OBJS)\notebook.exe: $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\notebook.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(NOTEBOOK_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\notebook_sample.res: .\..\..\samples\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc - -$(OBJS)\notebook_notebook.obj: .\notebook.cpp - $(CXX) /c /nologo /TP /Fo$@ $(NOTEBOOK_CXXFLAGS) .\notebook.cpp - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +NOTEBOOK_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\notebook.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +NOTEBOOK_OBJECTS = \ + $(OBJS)\notebook_notebook.obj +NOTEBOOK_RESOURCES = \ + $(OBJS)\notebook_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\notebook.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\notebook.exe del $(OBJS)\notebook.exe + -if exist $(OBJS)\notebook.ilk del $(OBJS)\notebook.ilk + -if exist $(OBJS)\notebook.pdb del $(OBJS)\notebook.pdb + +$(OBJS)\notebook.exe: $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\notebook.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(NOTEBOOK_OBJECTS) $(NOTEBOOK_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\notebook_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + +$(OBJS)\notebook_notebook.obj: .\notebook.cpp + $(CXX) /c /nologo /TP /Fo$@ $(NOTEBOOK_CXXFLAGS) .\notebook.cpp + diff --git a/samples/notebook/makefile.wat b/samples/notebook/makefile.wat index 3bcfe95e02..acce868e8a 100644 --- a/samples/notebook/makefile.wat +++ b/samples/notebook/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -NOTEBOOK_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -NOTEBOOK_OBJECTS = & - $(OBJS)\notebook_notebook.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\notebook.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\notebook.exe del $(OBJS)\notebook.exe - -$(OBJS)\notebook.exe : $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_sample.res - @%create $(OBJS)\notebook.lbc - @%append $(OBJS)\notebook.lbc option quiet - @%append $(OBJS)\notebook.lbc name $^@ - @%append $(OBJS)\notebook.lbc option caseexact - @%append $(OBJS)\notebook.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(NOTEBOOK_OBJECTS)) do @%append $(OBJS)\notebook.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\notebook.lbc library %i - @%append $(OBJS)\notebook.lbc option resource=$(OBJS)\notebook_sample.res - @for %i in () do @%append $(OBJS)\notebook.lbc option stack=%i - wlink @$(OBJS)\notebook.lbc - -$(OBJS)\notebook_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - -$(OBJS)\notebook_notebook.obj : .AUTODEPEND .\notebook.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NOTEBOOK_CXXFLAGS) $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +NOTEBOOK_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +NOTEBOOK_OBJECTS = & + $(OBJS)\notebook_notebook.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\notebook.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\notebook.exe del $(OBJS)\notebook.exe + +$(OBJS)\notebook.exe : $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_sample.res + @%create $(OBJS)\notebook.lbc + @%append $(OBJS)\notebook.lbc option quiet + @%append $(OBJS)\notebook.lbc name $^@ + @%append $(OBJS)\notebook.lbc option caseexact + @%append $(OBJS)\notebook.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(NOTEBOOK_OBJECTS)) do @%append $(OBJS)\notebook.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\notebook.lbc library %i + @%append $(OBJS)\notebook.lbc option resource=$(OBJS)\notebook_sample.res + @for %i in () do @%append $(OBJS)\notebook.lbc option stack=%i + wlink @$(OBJS)\notebook.lbc + +$(OBJS)\notebook_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + +$(OBJS)\notebook_notebook.obj : .AUTODEPEND .\notebook.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(NOTEBOOK_CXXFLAGS) $< + diff --git a/samples/notebook/notebook.dsp b/samples/notebook/notebook.dsp index 6061a58128..de5aee0747 100644 --- a/samples/notebook/notebook.dsp +++ b/samples/notebook/notebook.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\notebook" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\notebook.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\notebook.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\notebook.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\notebook.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\notebook" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\notebook.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\notebook.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\notebook.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\notebook.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\notebook" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\notebook.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\notebook.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\notebook.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\notebook.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\notebook" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\notebook.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\notebook.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\notebook.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\notebook.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/notebook/notebook_vc7.vcproj b/samples/notebook/notebook_vc7.vcproj index eb14dbd9ed..97e998e431 100644 --- a/samples/notebook/notebook_vc7.vcproj +++ b/samples/notebook/notebook_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\notebook.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\notebook.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\notebook.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\notebook.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\notebook.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\notebook.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\notebook.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\notebook.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\notebook.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\notebook.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\notebook.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\notebook.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -OLEAUTO_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\oleauto.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -OLEAUTO_OBJECTS = \ - $(OBJS)\oleauto_oleauto.obj \ - $(OBJS)\oleauto_oleauto.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\oleauto.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\oleauto.exe del $(OBJS)\oleauto.exe - -if exist $(OBJS)\oleauto.ilk del $(OBJS)\oleauto.ilk - -if exist $(OBJS)\oleauto.pdb del $(OBJS)\oleauto.pdb - -$(OBJS)\oleauto.exe: $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_oleauto.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\oleauto.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(OLEAUTO_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\oleauto_oleauto.obj: .\oleauto.cpp - $(CXX) /c /nologo /TP /Fo$@ $(OLEAUTO_CXXFLAGS) .\oleauto.cpp - -$(OBJS)\oleauto_oleauto.res: .\oleauto.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\oleauto.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +OLEAUTO_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\oleauto.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +OLEAUTO_OBJECTS = \ + $(OBJS)\oleauto_oleauto.obj +OLEAUTO_RESOURCES = \ + $(OBJS)\oleauto_oleauto.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\oleauto.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\oleauto.exe del $(OBJS)\oleauto.exe + -if exist $(OBJS)\oleauto.ilk del $(OBJS)\oleauto.ilk + -if exist $(OBJS)\oleauto.pdb del $(OBJS)\oleauto.pdb + +$(OBJS)\oleauto.exe: $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_oleauto.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\oleauto.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(OLEAUTO_OBJECTS) $(OLEAUTO_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\oleauto_oleauto.obj: .\oleauto.cpp + $(CXX) /c /nologo /TP /Fo$@ $(OLEAUTO_CXXFLAGS) .\oleauto.cpp + +$(OBJS)\oleauto_oleauto.res: .\oleauto.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\oleauto.rc + diff --git a/samples/oleauto/makefile.wat b/samples/oleauto/makefile.wat index 3fe4f43add..45f5143476 100644 --- a/samples/oleauto/makefile.wat +++ b/samples/oleauto/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -OLEAUTO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -OLEAUTO_OBJECTS = & - $(OBJS)\oleauto_oleauto.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\oleauto.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\oleauto.exe del $(OBJS)\oleauto.exe - -$(OBJS)\oleauto.exe : $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_oleauto.res - @%create $(OBJS)\oleauto.lbc - @%append $(OBJS)\oleauto.lbc option quiet - @%append $(OBJS)\oleauto.lbc name $^@ - @%append $(OBJS)\oleauto.lbc option caseexact - @%append $(OBJS)\oleauto.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(OLEAUTO_OBJECTS)) do @%append $(OBJS)\oleauto.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\oleauto.lbc library %i - @%append $(OBJS)\oleauto.lbc option resource=$(OBJS)\oleauto_oleauto.res - @for %i in () do @%append $(OBJS)\oleauto.lbc option stack=%i - wlink @$(OBJS)\oleauto.lbc - -$(OBJS)\oleauto_oleauto.obj : .AUTODEPEND .\oleauto.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OLEAUTO_CXXFLAGS) $< - -$(OBJS)\oleauto_oleauto.res : .AUTODEPEND .\oleauto.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +OLEAUTO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +OLEAUTO_OBJECTS = & + $(OBJS)\oleauto_oleauto.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\oleauto.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\oleauto.exe del $(OBJS)\oleauto.exe + +$(OBJS)\oleauto.exe : $(OLEAUTO_OBJECTS) $(OBJS)\oleauto_oleauto.res + @%create $(OBJS)\oleauto.lbc + @%append $(OBJS)\oleauto.lbc option quiet + @%append $(OBJS)\oleauto.lbc name $^@ + @%append $(OBJS)\oleauto.lbc option caseexact + @%append $(OBJS)\oleauto.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(OLEAUTO_OBJECTS)) do @%append $(OBJS)\oleauto.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\oleauto.lbc library %i + @%append $(OBJS)\oleauto.lbc option resource=$(OBJS)\oleauto_oleauto.res + @for %i in () do @%append $(OBJS)\oleauto.lbc option stack=%i + wlink @$(OBJS)\oleauto.lbc + +$(OBJS)\oleauto_oleauto.obj : .AUTODEPEND .\oleauto.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(OLEAUTO_CXXFLAGS) $< + +$(OBJS)\oleauto_oleauto.res : .AUTODEPEND .\oleauto.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/oleauto/oleauto.dsp b/samples/oleauto/oleauto.dsp index 788fd3c388..e3cde0337c 100644 --- a/samples/oleauto/oleauto.dsp +++ b/samples/oleauto/oleauto.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\oleauto" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\oleauto.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\oleauto.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\oleauto.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\oleauto.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\oleauto" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\oleauto.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\oleauto.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\oleauto.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\oleauto.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\oleauto" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\oleauto.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\oleauto.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\oleauto.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\oleauto.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\oleauto" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\oleauto.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\oleauto.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\oleauto.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\oleauto.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/oleauto/oleauto_vc7.vcproj b/samples/oleauto/oleauto_vc7.vcproj index adbb8e564e..ba56982994 100644 --- a/samples/oleauto/oleauto_vc7.vcproj +++ b/samples/oleauto/oleauto_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\oleauto.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\oleauto.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\oleauto.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\oleauto.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\oleauto.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\oleauto.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\oleauto.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\oleauto.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\oleauto.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\oleauto.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\oleauto.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\oleauto.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\cube.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\cube.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\cube.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\cube.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\cube.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\cube.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\cube.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\cube.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\cube.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\cube.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\cube.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\cube.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -CUBE_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\cube.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ - $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_9) \ - $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS) -CUBE_OBJECTS = \ - $(OBJS)\cube_cube.obj \ - $(OBJS)\cube_cube.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(USE_OPENGL)" == "1" -__cube___depname = $(OBJS)\cube.exe -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(__cube___depname) - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\cube.exe del $(OBJS)\cube.exe - -if exist $(OBJS)\cube.ilk del $(OBJS)\cube.ilk - -if exist $(OBJS)\cube.pdb del $(OBJS)\cube.pdb - -!if "$(USE_OPENGL)" == "1" -$(OBJS)\cube.exe: $(CUBE_OBJECTS) $(OBJS)\cube_cube.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\cube.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(CUBE_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< -!endif - -$(OBJS)\cube_cube.obj: .\cube.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CUBE_CXXFLAGS) .\cube.cpp - -$(OBJS)\cube_cube.res: .\cube.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\cube.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +CUBE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\cube.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \ + $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +CUBE_OBJECTS = \ + $(OBJS)\cube_cube.obj +CUBE_RESOURCES = \ + $(OBJS)\cube_cube.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(USE_OPENGL)" == "1" +__cube___depname = $(OBJS)\cube.exe +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__cube___depname) + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\cube.exe del $(OBJS)\cube.exe + -if exist $(OBJS)\cube.ilk del $(OBJS)\cube.ilk + -if exist $(OBJS)\cube.pdb del $(OBJS)\cube.pdb + +!if "$(USE_OPENGL)" == "1" +$(OBJS)\cube.exe: $(CUBE_OBJECTS) $(OBJS)\cube_cube.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\cube.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(CUBE_OBJECTS) $(CUBE_RESOURCES) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< +!endif + +$(OBJS)\cube_cube.obj: .\cube.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CUBE_CXXFLAGS) .\cube.cpp + +$(OBJS)\cube_cube.res: .\cube.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\cube.rc + diff --git a/samples/opengl/cube/makefile.wat b/samples/opengl/cube/makefile.wat index 8628fc655f..fe5515c30e 100644 --- a/samples/opengl/cube/makefile.wat +++ b/samples/opengl/cube/makefile.wat @@ -1,266 +1,266 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__cube___depname = -!ifeq USE_OPENGL 1 -__cube___depname = $(OBJS)\cube.exe -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -CUBE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & - $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) -CUBE_OBJECTS = & - $(OBJS)\cube_cube.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(__cube___depname) - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\cube.exe del $(OBJS)\cube.exe - -!ifeq USE_OPENGL 1 -$(OBJS)\cube.exe : $(CUBE_OBJECTS) $(OBJS)\cube_cube.res - @%create $(OBJS)\cube.lbc - @%append $(OBJS)\cube.lbc option quiet - @%append $(OBJS)\cube.lbc name $^@ - @%append $(OBJS)\cube.lbc option caseexact - @%append $(OBJS)\cube.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(CUBE_OBJECTS)) do @%append $(OBJS)\cube.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\cube.lbc library %i - @%append $(OBJS)\cube.lbc option resource=$(OBJS)\cube_cube.res - @for %i in () do @%append $(OBJS)\cube.lbc option stack=%i - wlink @$(OBJS)\cube.lbc -!endif - -$(OBJS)\cube_cube.obj : .AUTODEPEND .\cube.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CUBE_CXXFLAGS) $< - -$(OBJS)\cube_cube.res : .AUTODEPEND .\cube.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__cube___depname = +!ifeq USE_OPENGL 1 +__cube___depname = $(OBJS)\cube.exe +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +CUBE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & + $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & + $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) +CUBE_OBJECTS = & + $(OBJS)\cube_cube.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(__cube___depname) + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\cube.exe del $(OBJS)\cube.exe + +!ifeq USE_OPENGL 1 +$(OBJS)\cube.exe : $(CUBE_OBJECTS) $(OBJS)\cube_cube.res + @%create $(OBJS)\cube.lbc + @%append $(OBJS)\cube.lbc option quiet + @%append $(OBJS)\cube.lbc name $^@ + @%append $(OBJS)\cube.lbc option caseexact + @%append $(OBJS)\cube.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(CUBE_OBJECTS)) do @%append $(OBJS)\cube.lbc file %i + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\cube.lbc library %i + @%append $(OBJS)\cube.lbc option resource=$(OBJS)\cube_cube.res + @for %i in () do @%append $(OBJS)\cube.lbc option stack=%i + wlink @$(OBJS)\cube.lbc +!endif + +$(OBJS)\cube_cube.obj : .AUTODEPEND .\cube.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CUBE_CXXFLAGS) $< + +$(OBJS)\cube_cube.res : .AUTODEPEND .\cube.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + diff --git a/samples/opengl/isosurf/Makefile.in b/samples/opengl/isosurf/Makefile.in index d1a86f7f50..8aff1de922 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.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/isosurf/isosurf.dsp b/samples/opengl/isosurf/isosurf.dsp index e870813271..1d2467832d 100644 --- a/samples/opengl/isosurf/isosurf.dsp +++ b/samples/opengl/isosurf/isosurf.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\isosurf" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\isosurf.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\isosurf.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\isosurf.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\isosurf.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\isosurf" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\isosurf.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\isosurf.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\isosurf.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\isosurf.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\isosurf" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\isosurf.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\isosurf.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\isosurf.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\isosurf.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\isosurf" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\isosurf.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\isosurf.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\isosurf.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\isosurf.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH diff --git a/samples/opengl/isosurf/isosurf_vc7.vcproj b/samples/opengl/isosurf/isosurf_vc7.vcproj index e4d99453e3..c1db397238 100644 --- a/samples/opengl/isosurf/isosurf_vc7.vcproj +++ b/samples/opengl/isosurf/isosurf_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\isosurf.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\isosurf.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\isosurf.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\isosurf.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\isosurf.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\isosurf.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\isosurf.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\isosurf.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\isosurf.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\isosurf.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\isosurf.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\isosurf.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -ISOSURF_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\isosurf.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ - $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_9) \ - $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS) -ISOSURF_OBJECTS = \ - $(OBJS)\isosurf_sample.res \ - $(OBJS)\isosurf_isosurf.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(USE_OPENGL)" == "1" -__isosurf___depname = $(OBJS)\isosurf.exe -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(__isosurf___depname) data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\isosurf.exe del $(OBJS)\isosurf.exe - -if exist $(OBJS)\isosurf.ilk del $(OBJS)\isosurf.ilk - -if exist $(OBJS)\isosurf.pdb del $(OBJS)\isosurf.pdb - -!if "$(USE_OPENGL)" == "1" -$(OBJS)\isosurf.exe: $(ISOSURF_OBJECTS) $(OBJS)\isosurf_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\isosurf.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(ISOSURF_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< -!endif - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (isosurf.dat.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\isosurf_sample.res: .\..\..\..\samples\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\..\..\..\samples\sample.rc - -$(OBJS)\isosurf_isosurf.obj: .\isosurf.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ISOSURF_CXXFLAGS) .\isosurf.cpp - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +ISOSURF_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\isosurf.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \ + $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +ISOSURF_OBJECTS = \ + $(OBJS)\isosurf_isosurf.obj +ISOSURF_RESOURCES = \ + $(OBJS)\isosurf_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(USE_OPENGL)" == "1" +__isosurf___depname = $(OBJS)\isosurf.exe +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__isosurf___depname) data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\isosurf.exe del $(OBJS)\isosurf.exe + -if exist $(OBJS)\isosurf.ilk del $(OBJS)\isosurf.ilk + -if exist $(OBJS)\isosurf.pdb del $(OBJS)\isosurf.pdb + +!if "$(USE_OPENGL)" == "1" +$(OBJS)\isosurf.exe: $(ISOSURF_OBJECTS) $(OBJS)\isosurf_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\isosurf.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(ISOSURF_OBJECTS) $(ISOSURF_RESOURCES) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< +!endif + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (isosurf.dat.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\isosurf_sample.res: .\..\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\..\..\..\samples\sample.rc + +$(OBJS)\isosurf_isosurf.obj: .\isosurf.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ISOSURF_CXXFLAGS) .\isosurf.cpp + diff --git a/samples/opengl/isosurf/makefile.wat b/samples/opengl/isosurf/makefile.wat index 6ed9b2ccfe..a0289347c4 100644 --- a/samples/opengl/isosurf/makefile.wat +++ b/samples/opengl/isosurf/makefile.wat @@ -1,270 +1,270 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__isosurf___depname = -!ifeq USE_OPENGL 1 -__isosurf___depname = $(OBJS)\isosurf.exe -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -ISOSURF_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & - $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) -ISOSURF_OBJECTS = & - $(OBJS)\isosurf_isosurf.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(__isosurf___depname) data - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\isosurf.exe del $(OBJS)\isosurf.exe - -!ifeq USE_OPENGL 1 -$(OBJS)\isosurf.exe : $(ISOSURF_OBJECTS) $(OBJS)\isosurf_sample.res - @%create $(OBJS)\isosurf.lbc - @%append $(OBJS)\isosurf.lbc option quiet - @%append $(OBJS)\isosurf.lbc name $^@ - @%append $(OBJS)\isosurf.lbc option caseexact - @%append $(OBJS)\isosurf.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(ISOSURF_OBJECTS)) do @%append $(OBJS)\isosurf.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\isosurf.lbc library %i - @%append $(OBJS)\isosurf.lbc option resource=$(OBJS)\isosurf_sample.res - @for %i in () do @%append $(OBJS)\isosurf.lbc option stack=%i - wlink @$(OBJS)\isosurf.lbc -!endif - -data : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (isosurf.dat.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\isosurf_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< - -$(OBJS)\isosurf_isosurf.obj : .AUTODEPEND .\isosurf.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ISOSURF_CXXFLAGS) $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__isosurf___depname = +!ifeq USE_OPENGL 1 +__isosurf___depname = $(OBJS)\isosurf.exe +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +ISOSURF_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & + $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & + $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) +ISOSURF_OBJECTS = & + $(OBJS)\isosurf_isosurf.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(__isosurf___depname) data + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\isosurf.exe del $(OBJS)\isosurf.exe + +!ifeq USE_OPENGL 1 +$(OBJS)\isosurf.exe : $(ISOSURF_OBJECTS) $(OBJS)\isosurf_sample.res + @%create $(OBJS)\isosurf.lbc + @%append $(OBJS)\isosurf.lbc option quiet + @%append $(OBJS)\isosurf.lbc name $^@ + @%append $(OBJS)\isosurf.lbc option caseexact + @%append $(OBJS)\isosurf.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(ISOSURF_OBJECTS)) do @%append $(OBJS)\isosurf.lbc file %i + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\isosurf.lbc library %i + @%append $(OBJS)\isosurf.lbc option resource=$(OBJS)\isosurf_sample.res + @for %i in () do @%append $(OBJS)\isosurf.lbc option stack=%i + wlink @$(OBJS)\isosurf.lbc +!endif + +data : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (isosurf.dat.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\isosurf_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + +$(OBJS)\isosurf_isosurf.obj : .AUTODEPEND .\isosurf.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ISOSURF_CXXFLAGS) $< + diff --git a/samples/opengl/makefile.bcc b/samples/opengl/makefile.bcc index 49944e8461..10e8eafb51 100644 --- a/samples/opengl/makefile.bcc +++ b/samples/opengl/makefile.bcc @@ -1,83 +1,83 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -.autodepend - -!ifndef BCCDIR -!ifndef MAKEDIR -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif -BCCDIR = $(MAKEDIR)\.. -!endif - -!include ../../build/msw/config.bcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ - -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \ - -DCPP="$(CPP)" -DSHARED="$(SHARED)" -DWXUNIV="$(WXUNIV)" \ - -DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" -DBUILD="$(BUILD)" \ - -DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \ - -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \ - -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \ - -DUSE_AUI="$(USE_AUI)" -DUSE_RIBBON="$(USE_RIBBON)" \ - -DUSE_PROPGRID="$(USE_PROPGRID)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \ - -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \ - -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \ - -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \ - -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \ - -DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \ - -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \ - -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" - -### Conditionally set variables: ### - - - -### Targets: ### - -all: cube isosurf penguin - -clean: - -if exist .\*.obj del .\*.obj - -if exist .\*.res del .\*.res - -if exist .\*.csm del .\*.csm - @echo cd cube >cube.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>cube.bat - call cube.bat - @del cube.bat - @echo cd isosurf >isosurf.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>isosurf.bat - call isosurf.bat - @del isosurf.bat - @echo cd penguin >penguin.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>penguin.bat - call penguin.bat - @del penguin.bat - -cube: - @echo cd cube >cube.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>cube.bat - call cube.bat - @del cube.bat - -isosurf: - @echo cd isosurf >isosurf.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>isosurf.bat - call isosurf.bat - @del isosurf.bat - -penguin: - @echo cd penguin >penguin.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>penguin.bat - call penguin.bat - @del penguin.bat - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +.autodepend + +!ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../build/msw/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ + -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \ + -DCPP="$(CPP)" -DSHARED="$(SHARED)" -DWXUNIV="$(WXUNIV)" \ + -DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" -DBUILD="$(BUILD)" \ + -DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \ + -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \ + -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \ + -DUSE_AUI="$(USE_AUI)" -DUSE_RIBBON="$(USE_RIBBON)" \ + -DUSE_PROPGRID="$(USE_PROPGRID)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \ + -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \ + -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \ + -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \ + -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \ + -DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \ + -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \ + -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" + +### Conditionally set variables: ### + + + +### Targets: ### + +all: cube isosurf penguin + +clean: + -if exist .\*.obj del .\*.obj + -if exist .\*.res del .\*.res + -if exist .\*.csm del .\*.csm + @echo cd cube >cube.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>cube.bat + call cube.bat + @del cube.bat + @echo cd isosurf >isosurf.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>isosurf.bat + call isosurf.bat + @del isosurf.bat + @echo cd penguin >penguin.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>penguin.bat + call penguin.bat + @del penguin.bat + +cube: + @echo cd cube >cube.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>cube.bat + call cube.bat + @del cube.bat + +isosurf: + @echo cd isosurf >isosurf.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>isosurf.bat + call isosurf.bat + @del isosurf.bat + +penguin: + @echo cd penguin >penguin.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>penguin.bat + call penguin.bat + @del penguin.bat + diff --git a/samples/opengl/makefile.gcc b/samples/opengl/makefile.gcc index c4e1888930..2a93727f2c 100644 --- a/samples/opengl/makefile.gcc +++ b/samples/opengl/makefile.gcc @@ -1,63 +1,63 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -include ../../build/msw/config.gcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ - LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \ - CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ - LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" WXUNIV="$(WXUNIV)" \ - UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \ - DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \ - MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ - USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \ - USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \ - USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \ - USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ - USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \ - USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \ - OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \ - WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ - CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ - RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)" - -### Conditionally set variables: ### - - - -### Targets: ### - -all: cube isosurf penguin - -clean: - -if exist .\*.o del .\*.o - -if exist .\*.d del .\*.d - $(MAKE) -C cube -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C isosurf -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C penguin -f makefile.gcc $(MAKEARGS) clean - -cube: - $(MAKE) -C cube -f makefile.gcc $(MAKEARGS) all - -isosurf: - $(MAKE) -C isosurf -f makefile.gcc $(MAKEARGS) all - -penguin: - $(MAKE) -C penguin -f makefile.gcc $(MAKEARGS) all - -.PHONY: all clean cube isosurf penguin - - -SHELL := $(COMSPEC) - -# Dependencies tracking: --include ./*.d +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../build/msw/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ + LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \ + CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ + LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" WXUNIV="$(WXUNIV)" \ + UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \ + DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \ + MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ + USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \ + USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \ + USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \ + USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ + USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \ + USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \ + OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \ + WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ + CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ + RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)" + +### Conditionally set variables: ### + + + +### Targets: ### + +all: cube isosurf penguin + +clean: + -if exist .\*.o del .\*.o + -if exist .\*.d del .\*.d + $(MAKE) -C cube -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C isosurf -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C penguin -f makefile.gcc $(MAKEARGS) clean + +cube: + $(MAKE) -C cube -f makefile.gcc $(MAKEARGS) all + +isosurf: + $(MAKE) -C isosurf -f makefile.gcc $(MAKEARGS) all + +penguin: + $(MAKE) -C penguin -f makefile.gcc $(MAKEARGS) all + +.PHONY: all clean cube isosurf penguin + + +SHELL := $(COMSPEC) + +# Dependencies tracking: +-include ./*.d diff --git a/samples/opengl/makefile.unx b/samples/opengl/makefile.unx index 3402cd769d..0463df6e95 100644 --- a/samples/opengl/makefile.unx +++ b/samples/opengl/makefile.unx @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/makefile.vc b/samples/opengl/makefile.vc index 2da245b0cb..ee5a15e355 100644 --- a/samples/opengl/makefile.vc +++ b/samples/opengl/makefile.vc @@ -1,68 +1,68 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include <../../build/msw/config.vc> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ - CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \ - WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \ - TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \ - DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \ - MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ - USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \ - USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \ - USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \ - USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ - USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \ - USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \ - OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \ - WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ - CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ - RUNTIME_LIBS="$(RUNTIME_LIBS)" - -### Conditionally set variables: ### - - - -### Targets: ### - -all: sub_cube sub_isosurf sub_penguin - -clean: - -if exist .\*.obj del .\*.obj - -if exist .\*.res del .\*.res - -if exist .\*.pch del .\*.pch - cd cube - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd isosurf - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd penguin - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - -sub_cube: - cd cube - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_isosurf: - cd isosurf - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_penguin: - cd penguin - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ + CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \ + WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \ + TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \ + DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \ + MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ + USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \ + USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \ + USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \ + USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ + USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \ + USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \ + OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \ + WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ + CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ + RUNTIME_LIBS="$(RUNTIME_LIBS)" + +### Conditionally set variables: ### + + + +### Targets: ### + +all: sub_cube sub_isosurf sub_penguin + +clean: + -if exist .\*.obj del .\*.obj + -if exist .\*.res del .\*.res + -if exist .\*.pch del .\*.pch + cd cube + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd isosurf + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd penguin + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + +sub_cube: + cd cube + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_isosurf: + cd isosurf + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_penguin: + cd penguin + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + diff --git a/samples/opengl/makefile.wat b/samples/opengl/makefile.wat index bc22385170..9bb0275c8c 100644 --- a/samples/opengl/makefile.wat +++ b/samples/opengl/makefile.wat @@ -1,88 +1,88 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - - -### Variables: ### - -MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & - CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" & - WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" & - DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" & - MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" & - USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" & - USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" & - USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" & - USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" & - USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" & - USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" & - OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" & - WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" & - CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" & - RUNTIME_LIBS="$(RUNTIME_LIBS)" - - -### Targets: ### - -all : .SYMBOLIC cube isosurf penguin - -clean : .SYMBOLIC - -if exist .\*.obj del .\*.obj - -if exist .\*.res del .\*.res - -if exist .\*.lbc del .\*.lbc - -if exist .\*.ilk del .\*.ilk - -if exist .\*.pch del .\*.pch - cd cube - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd isosurf - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd penguin - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - -cube : .SYMBOLIC - cd cube - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -isosurf : .SYMBOLIC - cd isosurf - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -penguin : .SYMBOLIC - cd penguin - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + + +### Variables: ### + +MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & + CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" & + WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" & + DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" & + MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" & + USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" & + USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" & + USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" & + USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" & + USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" & + USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" & + OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" & + WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" & + CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" & + RUNTIME_LIBS="$(RUNTIME_LIBS)" + + +### Targets: ### + +all : .SYMBOLIC cube isosurf penguin + +clean : .SYMBOLIC + -if exist .\*.obj del .\*.obj + -if exist .\*.res del .\*.res + -if exist .\*.lbc del .\*.lbc + -if exist .\*.ilk del .\*.ilk + -if exist .\*.pch del .\*.pch + cd cube + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd isosurf + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd penguin + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + +cube : .SYMBOLIC + cd cube + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +isosurf : .SYMBOLIC + cd isosurf + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +penguin : .SYMBOLIC + cd penguin + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + diff --git a/samples/opengl/penguin/Makefile.in b/samples/opengl/penguin/Makefile.in index 1f92494707..feea782406 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.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/penguin/makefile.bcc b/samples/opengl/penguin/makefile.bcc index 312d004e65..b85a7dd11e 100644 --- a/samples/opengl/penguin/makefile.bcc +++ b/samples/opengl/penguin/makefile.bcc @@ -1,255 +1,255 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -.autodepend - -!ifndef BCCDIR -!ifndef MAKEDIR -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif -BCCDIR = $(MAKEDIR)\.. -!endif - -!include ../../../build/msw/config.bcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = bcc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -PENGUIN_CFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \ - -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CFLAGS) -PENGUIN_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \ - -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS) -PENGUIN_OBJECTS = \ - $(OBJS)\penguin_penguin.obj \ - $(OBJS)\penguin_dxfrenderer.obj \ - $(OBJS)\penguin_trackball.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(USE_OPENGL)" == "1" -__penguin___depname = $(OBJS)\penguin.exe -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_2 = -Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_2 = -O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_5 = -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_5 = mt -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_6 = -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_6 = -tWM -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_7 = -tWR -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_7 = -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = i -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = -DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = -dwxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = -DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = -dwxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = -D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = -d_UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = -DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = -dWXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = -v -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = -v- -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO = -v- -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO = -v -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(__penguin___depname) data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.csm del $(OBJS)\*.csm - -if exist $(OBJS)\penguin.exe del $(OBJS)\penguin.exe - -if exist $(OBJS)\penguin.tds del $(OBJS)\penguin.tds - -if exist $(OBJS)\penguin.ilc del $(OBJS)\penguin.ilc - -if exist $(OBJS)\penguin.ild del $(OBJS)\penguin.ild - -if exist $(OBJS)\penguin.ilf del $(OBJS)\penguin.ilf - -if exist $(OBJS)\penguin.ils del $(OBJS)\penguin.ils - -!if "$(USE_OPENGL)" == "1" -$(OBJS)\penguin.exe: $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin.res - ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| - c0w32.obj $(PENGUIN_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\penguin_penguin.res -| -!endif - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (penguin.dxf.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\penguin_penguin.obj: .\penguin.cpp - $(CXX) -q -c -P -o$@ $(PENGUIN_CXXFLAGS) .\penguin.cpp - -$(OBJS)\penguin_dxfrenderer.obj: .\dxfrenderer.cpp - $(CXX) -q -c -P -o$@ $(PENGUIN_CXXFLAGS) .\dxfrenderer.cpp - -$(OBJS)\penguin_trackball.obj: .\trackball.c - $(CC) -q -c -P- -o$@ $(PENGUIN_CFLAGS) .\trackball.c - -$(OBJS)\penguin_penguin.res: .\penguin.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\penguin.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +.autodepend + +!ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../../build/msw/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = bcc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +PENGUIN_CFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \ + -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CFLAGS) +PENGUIN_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -I. $(__DLLFLAG_p) \ + -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS) +PENGUIN_OBJECTS = \ + $(OBJS)\penguin_penguin.obj \ + $(OBJS)\penguin_dxfrenderer.obj \ + $(OBJS)\penguin_trackball.obj + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(USE_OPENGL)" == "1" +__penguin___depname = $(OBJS)\penguin.exe +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_5 = +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_5 = mt +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_6 = +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_6 = -tWM +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_8 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_8 = +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = -DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = -dwxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = -DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = -dwxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -d_UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = -v +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__penguin___depname) data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.csm del $(OBJS)\*.csm + -if exist $(OBJS)\penguin.exe del $(OBJS)\penguin.exe + -if exist $(OBJS)\penguin.tds del $(OBJS)\penguin.tds + -if exist $(OBJS)\penguin.ilc del $(OBJS)\penguin.ilc + -if exist $(OBJS)\penguin.ild del $(OBJS)\penguin.ild + -if exist $(OBJS)\penguin.ilf del $(OBJS)\penguin.ilf + -if exist $(OBJS)\penguin.ils del $(OBJS)\penguin.ils + +!if "$(USE_OPENGL)" == "1" +$(OBJS)\penguin.exe: $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin.res + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| + c0w32.obj $(PENGUIN_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\penguin_penguin.res +| +!endif + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (penguin.dxf.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\penguin_penguin.obj: .\penguin.cpp + $(CXX) -q -c -P -o$@ $(PENGUIN_CXXFLAGS) .\penguin.cpp + +$(OBJS)\penguin_dxfrenderer.obj: .\dxfrenderer.cpp + $(CXX) -q -c -P -o$@ $(PENGUIN_CXXFLAGS) .\dxfrenderer.cpp + +$(OBJS)\penguin_trackball.obj: .\trackball.c + $(CC) -q -c -P- -o$@ $(PENGUIN_CFLAGS) .\trackball.c + +$(OBJS)\penguin_penguin.res: .\penguin.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\penguin.rc + diff --git a/samples/opengl/penguin/makefile.gcc b/samples/opengl/penguin/makefile.gcc index 6b6542df3b..ec42cb9c0f 100644 --- a/samples/opengl/penguin/makefile.gcc +++ b/samples/opengl/penguin/makefile.gcc @@ -1,249 +1,249 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -include ../../../build/msw/config.gcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -CPPDEPS = -MT$@ -MF$@.d -MD -MP -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = gcc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -PENGUIN_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CFLAGS) -PENGUIN_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \ - $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) -PENGUIN_OBJECTS = \ - $(OBJS)\penguin_penguin.o \ - $(OBJS)\penguin_dxfrenderer.o \ - $(OBJS)\penguin_trackball.o \ - $(OBJS)\penguin_penguin_rc.o - -### Conditionally set variables: ### - -ifeq ($(GCC_VERSION),2.95) -GCCFLAGS = -fvtable-thunks -endif -ifeq ($(USE_GUI),0) -PORTNAME = base -endif -ifeq ($(USE_GUI),1) -PORTNAME = msw -endif -ifeq ($(BUILD),debug) -WXDEBUGFLAG = d -endif -ifeq ($(UNICODE),1) -WXUNICODEFLAG = u -endif -ifeq ($(WXUNIV),1) -WXUNIVNAME = univ -endif -ifeq ($(SHARED),1) -WXDLLFLAG = dll -endif -ifeq ($(SHARED),0) -LIBTYPE_SUFFIX = lib -endif -ifeq ($(SHARED),1) -LIBTYPE_SUFFIX = dll -endif -ifeq ($(MONOLITHIC),0) -EXTRALIBS_FOR_BASE = -endif -ifeq ($(MONOLITHIC),1) -EXTRALIBS_FOR_BASE = -endif -ifeq ($(USE_OPENGL),1) -__penguin___depname = $(OBJS)\penguin.exe -endif -ifeq ($(BUILD),debug) -__OPTIMIZEFLAG_2 = -O0 -endif -ifeq ($(BUILD),release) -__OPTIMIZEFLAG_2 = -O2 -endif -ifeq ($(USE_RTTI),0) -__RTTIFLAG_5 = -fno-rtti -endif -ifeq ($(USE_RTTI),1) -__RTTIFLAG_5 = -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONSFLAG_6 = -fno-exceptions -endif -ifeq ($(USE_EXCEPTIONS),1) -__EXCEPTIONSFLAG_6 = -endif -ifeq ($(WXUNIV),1) -__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -endif -ifeq ($(WXUNIV),1) -__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ -endif -ifeq ($(DEBUG_FLAG),0) -__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -endif -ifeq ($(DEBUG_FLAG),0) -__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS -endif -ifeq ($(USE_RTTI),0) -__RTTI_DEFINE_p = -DwxNO_RTTI -endif -ifeq ($(USE_RTTI),0) -__RTTI_DEFINE_p_1 = --define wxNO_RTTI -endif -ifeq ($(USE_THREADS),0) -__THREAD_DEFINE_p = -DwxNO_THREADS -endif -ifeq ($(USE_THREADS),0) -__THREAD_DEFINE_p_1 = --define wxNO_THREADS -endif -ifeq ($(UNICODE),0) -__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 -endif -ifeq ($(UNICODE),1) -__UNICODE_DEFINE_p = -D_UNICODE -endif -ifeq ($(UNICODE),0) -__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0 -endif -ifeq ($(UNICODE),1) -__UNICODE_DEFINE_p_1 = --define _UNICODE -endif -ifeq ($(MSLU),1) -__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 -endif -ifeq ($(MSLU),1) -__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1 -endif -ifeq ($(USE_GDIPLUS),1) -__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1 -endif -ifeq ($(USE_GDIPLUS),1) -__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1 -endif -ifeq ($(SHARED),1) -__DLLFLAG_p = -DWXUSINGDLL -endif -ifeq ($(SHARED),1) -__DLLFLAG_p_1 = --define WXUSINGDLL -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_CORE_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_BASE_p = \ - -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -endif -ifeq ($(MONOLITHIC),1) -__WXLIB_MONO_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -endif -ifeq ($(USE_GUI),1) -__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -endif -ifeq ($(USE_GUI),1) -__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -endif -ifeq ($(USE_GUI),1) -__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -endif -ifeq ($(MSLU),1) -__UNICOWS_LIB_p = -lunicows -endif -ifeq ($(USE_GDIPLUS),1) -__GDIPLUS_LIB_p = -lgdiplus -endif -ifeq ($(BUILD),debug) -ifeq ($(DEBUG_INFO),default) -__DEBUGINFO = -g -endif -endif -ifeq ($(BUILD),release) -ifeq ($(DEBUG_INFO),default) -__DEBUGINFO = -endif -endif -ifeq ($(DEBUG_INFO),0) -__DEBUGINFO = -endif -ifeq ($(DEBUG_INFO),1) -__DEBUGINFO = -g -endif -ifeq ($(USE_THREADS),0) -__THREADSFLAG = -endif -ifeq ($(USE_THREADS),1) -__THREADSFLAG = -mthreads -endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(__penguin___depname) data - -clean: - -if exist $(OBJS)\*.o del $(OBJS)\*.o - -if exist $(OBJS)\*.d del $(OBJS)\*.d - -if exist $(OBJS)\penguin.exe del $(OBJS)\penguin.exe - -ifeq ($(USE_OPENGL),1) -$(OBJS)\penguin.exe: $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin_rc.o - $(CXX) -o $@ $(PENGUIN_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet -endif - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %%f in (penguin.dxf.gz) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) - -$(OBJS)\penguin_penguin.o: ./penguin.cpp - $(CXX) -c -o $@ $(PENGUIN_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\penguin_dxfrenderer.o: ./dxfrenderer.cpp - $(CXX) -c -o $@ $(PENGUIN_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\penguin_trackball.o: ./trackball.c - $(CC) -c -o $@ $(PENGUIN_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\penguin_penguin_rc.o: ./penguin.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH - -.PHONY: all clean data - - -SHELL := $(COMSPEC) - -# Dependencies tracking: --include $(OBJS)/*.d +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../../build/msw/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +CPPDEPS = -MT$@ -MF$@.d -MD -MP +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = gcc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +PENGUIN_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ + $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \ + $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CFLAGS) +PENGUIN_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ + $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \ + $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \ + $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) +PENGUIN_OBJECTS = \ + $(OBJS)\penguin_penguin.o \ + $(OBJS)\penguin_dxfrenderer.o \ + $(OBJS)\penguin_trackball.o \ + $(OBJS)\penguin_penguin_rc.o + +### Conditionally set variables: ### + +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif +ifeq ($(USE_GUI),0) +PORTNAME = base +endif +ifeq ($(USE_GUI),1) +PORTNAME = msw +endif +ifeq ($(BUILD),debug) +WXDEBUGFLAG = d +endif +ifeq ($(UNICODE),1) +WXUNICODEFLAG = u +endif +ifeq ($(WXUNIV),1) +WXUNIVNAME = univ +endif +ifeq ($(SHARED),1) +WXDLLFLAG = dll +endif +ifeq ($(SHARED),0) +LIBTYPE_SUFFIX = lib +endif +ifeq ($(SHARED),1) +LIBTYPE_SUFFIX = dll +endif +ifeq ($(MONOLITHIC),0) +EXTRALIBS_FOR_BASE = +endif +ifeq ($(MONOLITHIC),1) +EXTRALIBS_FOR_BASE = +endif +ifeq ($(USE_OPENGL),1) +__penguin___depname = $(OBJS)\penguin.exe +endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif +ifeq ($(USE_RTTI),0) +__RTTIFLAG_5 = -fno-rtti +endif +ifeq ($(USE_RTTI),1) +__RTTIFLAG_5 = +endif +ifeq ($(USE_EXCEPTIONS),0) +__EXCEPTIONSFLAG_6 = -fno-exceptions +endif +ifeq ($(USE_EXCEPTIONS),1) +__EXCEPTIONSFLAG_6 = +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ +endif +ifeq ($(DEBUG_FLAG),0) +__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 +endif +ifeq ($(DEBUG_FLAG),0) +__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 +endif +ifeq ($(USE_EXCEPTIONS),0) +__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS +endif +ifeq ($(USE_EXCEPTIONS),0) +__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS +endif +ifeq ($(USE_RTTI),0) +__RTTI_DEFINE_p = -DwxNO_RTTI +endif +ifeq ($(USE_RTTI),0) +__RTTI_DEFINE_p_1 = --define wxNO_RTTI +endif +ifeq ($(USE_THREADS),0) +__THREAD_DEFINE_p = -DwxNO_THREADS +endif +ifeq ($(USE_THREADS),0) +__THREAD_DEFINE_p_1 = --define wxNO_THREADS +endif +ifeq ($(UNICODE),0) +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -D_UNICODE +endif +ifeq ($(UNICODE),0) +__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p_1 = --define _UNICODE +endif +ifeq ($(MSLU),1) +__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 +endif +ifeq ($(MSLU),1) +__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1 +endif +ifeq ($(USE_GDIPLUS),1) +__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1 +endif +ifeq ($(USE_GDIPLUS),1) +__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1 +endif +ifeq ($(SHARED),1) +__DLLFLAG_p = -DWXUSINGDLL +endif +ifeq ($(SHARED),1) +__DLLFLAG_p_1 = --define WXUSINGDLL +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = \ + -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) +endif +ifeq ($(MONOLITHIC),1) +__WXLIB_MONO_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) +endif +ifeq ($(USE_GUI),1) +__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +endif +ifeq ($(MSLU),1) +__UNICOWS_LIB_p = -lunicows +endif +ifeq ($(USE_GDIPLUS),1) +__GDIPLUS_LIB_p = -lgdiplus +endif +ifeq ($(BUILD),debug) +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = -g +endif +endif +ifeq ($(BUILD),release) +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = +endif +endif +ifeq ($(DEBUG_INFO),0) +__DEBUGINFO = +endif +ifeq ($(DEBUG_INFO),1) +__DEBUGINFO = -g +endif +ifeq ($(USE_THREADS),0) +__THREADSFLAG = +endif +ifeq ($(USE_THREADS),1) +__THREADSFLAG = -mthreads +endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__penguin___depname) data + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -if exist $(OBJS)\*.d del $(OBJS)\*.d + -if exist $(OBJS)\penguin.exe del $(OBJS)\penguin.exe + +ifeq ($(USE_OPENGL),1) +$(OBJS)\penguin.exe: $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin_rc.o + $(CXX) -o $@ $(PENGUIN_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet +endif + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %%f in (penguin.dxf.gz) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) + +$(OBJS)\penguin_penguin.o: ./penguin.cpp + $(CXX) -c -o $@ $(PENGUIN_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\penguin_dxfrenderer.o: ./dxfrenderer.cpp + $(CXX) -c -o $@ $(PENGUIN_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\penguin_trackball.o: ./trackball.c + $(CC) -c -o $@ $(PENGUIN_CFLAGS) $(CPPDEPS) $< + +$(OBJS)\penguin_penguin_rc.o: ./penguin.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH + +.PHONY: all clean data + + +SHELL := $(COMSPEC) + +# Dependencies tracking: +-include $(OBJS)/*.d diff --git a/samples/opengl/penguin/makefile.unx b/samples/opengl/penguin/makefile.unx index a3a8cececb..0c010e9fe6 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.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/samples/opengl/penguin/makefile.vc b/samples/opengl/penguin/makefile.vc index c0880b2f5e..492d4b16a8 100644 --- a/samples/opengl/penguin/makefile.vc +++ b/samples/opengl/penguin/makefile.vc @@ -1,335 +1,361 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include <../../../build/msw/config.vc> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -PENGUIN_CFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\penguin.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ - $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(CPPFLAGS) $(CFLAGS) -PENGUIN_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\penguin.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ - $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_9) \ - $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS) -PENGUIN_OBJECTS = \ - $(OBJS)\penguin_penguin.obj \ - $(OBJS)\penguin_dxfrenderer.obj \ - $(OBJS)\penguin_trackball.obj \ - $(OBJS)\penguin_penguin.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(USE_OPENGL)" == "1" -__penguin___depname = $(OBJS)\penguin.exe -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(__penguin___depname) data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\penguin.exe del $(OBJS)\penguin.exe - -if exist $(OBJS)\penguin.ilk del $(OBJS)\penguin.ilk - -if exist $(OBJS)\penguin.pdb del $(OBJS)\penguin.pdb - -!if "$(USE_OPENGL)" == "1" -$(OBJS)\penguin.exe: $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\penguin.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(PENGUIN_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< -!endif - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (penguin.dxf.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\penguin_penguin.obj: .\penguin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(PENGUIN_CXXFLAGS) .\penguin.cpp - -$(OBJS)\penguin_dxfrenderer.obj: .\dxfrenderer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(PENGUIN_CXXFLAGS) .\dxfrenderer.cpp - -$(OBJS)\penguin_trackball.obj: .\trackball.c - $(CC) /c /nologo /TC /Fo$@ $(PENGUIN_CFLAGS) .\trackball.c - -$(OBJS)\penguin_penguin.res: .\penguin.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\penguin.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +PENGUIN_CFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\penguin.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(CPPFLAGS) \ + $(CFLAGS) +PENGUIN_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\penguin.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \ + $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +PENGUIN_OBJECTS = \ + $(OBJS)\penguin_penguin.obj \ + $(OBJS)\penguin_dxfrenderer.obj \ + $(OBJS)\penguin_trackball.obj +PENGUIN_RESOURCES = \ + $(OBJS)\penguin_penguin.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(USE_OPENGL)" == "1" +__penguin___depname = $(OBJS)\penguin.exe +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__penguin___depname) data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\penguin.exe del $(OBJS)\penguin.exe + -if exist $(OBJS)\penguin.ilk del $(OBJS)\penguin.ilk + -if exist $(OBJS)\penguin.pdb del $(OBJS)\penguin.pdb + +!if "$(USE_OPENGL)" == "1" +$(OBJS)\penguin.exe: $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\penguin.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(PENGUIN_OBJECTS) $(PENGUIN_RESOURCES) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< +!endif + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (penguin.dxf.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\penguin_penguin.obj: .\penguin.cpp + $(CXX) /c /nologo /TP /Fo$@ $(PENGUIN_CXXFLAGS) .\penguin.cpp + +$(OBJS)\penguin_dxfrenderer.obj: .\dxfrenderer.cpp + $(CXX) /c /nologo /TP /Fo$@ $(PENGUIN_CXXFLAGS) .\dxfrenderer.cpp + +$(OBJS)\penguin_trackball.obj: .\trackball.c + $(CC) /c /nologo /TC /Fo$@ $(PENGUIN_CFLAGS) .\trackball.c + +$(OBJS)\penguin_penguin.res: .\penguin.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\penguin.rc + diff --git a/samples/opengl/penguin/makefile.wat b/samples/opengl/penguin/makefile.wat index 8e93fe0a88..94daa4e204 100644 --- a/samples/opengl/penguin/makefile.wat +++ b/samples/opengl/penguin/makefile.wat @@ -1,284 +1,284 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__penguin___depname = -!ifeq USE_OPENGL 1 -__penguin___depname = $(OBJS)\penguin.exe -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -PENGUIN_CFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(CPPFLAGS) $(CFLAGS) -PENGUIN_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & - $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) -PENGUIN_OBJECTS = & - $(OBJS)\penguin_penguin.obj & - $(OBJS)\penguin_dxfrenderer.obj & - $(OBJS)\penguin_trackball.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(__penguin___depname) data - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\penguin.exe del $(OBJS)\penguin.exe - -!ifeq USE_OPENGL 1 -$(OBJS)\penguin.exe : $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin.res - @%create $(OBJS)\penguin.lbc - @%append $(OBJS)\penguin.lbc option quiet - @%append $(OBJS)\penguin.lbc name $^@ - @%append $(OBJS)\penguin.lbc option caseexact - @%append $(OBJS)\penguin.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(PENGUIN_OBJECTS)) do @%append $(OBJS)\penguin.lbc file %i - @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\penguin.lbc library %i - @%append $(OBJS)\penguin.lbc option resource=$(OBJS)\penguin_penguin.res - @for %i in () do @%append $(OBJS)\penguin.lbc option stack=%i - wlink @$(OBJS)\penguin.lbc -!endif - -data : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (penguin.dxf.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\penguin_penguin.obj : .AUTODEPEND .\penguin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PENGUIN_CXXFLAGS) $< - -$(OBJS)\penguin_dxfrenderer.obj : .AUTODEPEND .\dxfrenderer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PENGUIN_CXXFLAGS) $< - -$(OBJS)\penguin_trackball.obj : .AUTODEPEND .\trackball.c - $(CC) -bt=nt -zq -fo=$^@ $(PENGUIN_CFLAGS) $< - -$(OBJS)\penguin_penguin.res : .AUTODEPEND .\penguin.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__penguin___depname = +!ifeq USE_OPENGL 1 +__penguin___depname = $(OBJS)\penguin.exe +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +PENGUIN_CFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & + $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(CPPFLAGS) $(CFLAGS) +PENGUIN_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & + $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & + $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) +PENGUIN_OBJECTS = & + $(OBJS)\penguin_penguin.obj & + $(OBJS)\penguin_dxfrenderer.obj & + $(OBJS)\penguin_trackball.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(__penguin___depname) data + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\penguin.exe del $(OBJS)\penguin.exe + +!ifeq USE_OPENGL 1 +$(OBJS)\penguin.exe : $(PENGUIN_OBJECTS) $(OBJS)\penguin_penguin.res + @%create $(OBJS)\penguin.lbc + @%append $(OBJS)\penguin.lbc option quiet + @%append $(OBJS)\penguin.lbc name $^@ + @%append $(OBJS)\penguin.lbc option caseexact + @%append $(OBJS)\penguin.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(PENGUIN_OBJECTS)) do @%append $(OBJS)\penguin.lbc file %i + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\penguin.lbc library %i + @%append $(OBJS)\penguin.lbc option resource=$(OBJS)\penguin_penguin.res + @for %i in () do @%append $(OBJS)\penguin.lbc option stack=%i + wlink @$(OBJS)\penguin.lbc +!endif + +data : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (penguin.dxf.gz) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\penguin_penguin.obj : .AUTODEPEND .\penguin.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(PENGUIN_CXXFLAGS) $< + +$(OBJS)\penguin_dxfrenderer.obj : .AUTODEPEND .\dxfrenderer.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(PENGUIN_CXXFLAGS) $< + +$(OBJS)\penguin_trackball.obj : .AUTODEPEND .\trackball.c + $(CC) -bt=nt -zq -fo=$^@ $(PENGUIN_CFLAGS) $< + +$(OBJS)\penguin_penguin.res : .AUTODEPEND .\penguin.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + diff --git a/samples/opengl/penguin/penguin.dsp b/samples/opengl/penguin/penguin.dsp index 0c8fae4a15..dab0e06331 100644 --- a/samples/opengl/penguin/penguin.dsp +++ b/samples/opengl/penguin/penguin.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\penguin" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\penguin.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\penguin.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\penguin.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\penguin.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\penguin" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\penguin.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\penguin.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\penguin.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\penguin.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\penguin" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\penguin.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\penguin.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\penguin.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\penguin.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\penguin" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\penguin.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\penguin.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\penguin.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\penguin.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH diff --git a/samples/opengl/penguin/penguin_vc7.vcproj b/samples/opengl/penguin/penguin_vc7.vcproj index a0ccccbb68..541a43ba8c 100644 --- a/samples/opengl/penguin/penguin_vc7.vcproj +++ b/samples/opengl/penguin/penguin_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\penguin.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\penguin.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\penguin.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\penguin.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\penguin.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\penguin.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\penguin.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\penguin.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\penguin.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\penguin.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\penguin.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\penguin.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -OWNERDRW_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\ownerdrw.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -OWNERDRW_OBJECTS = \ - $(OBJS)\ownerdrw_ownerdrw.obj \ - $(OBJS)\ownerdrw_ownerdrw.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\ownerdrw.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\ownerdrw.exe del $(OBJS)\ownerdrw.exe - -if exist $(OBJS)\ownerdrw.ilk del $(OBJS)\ownerdrw.ilk - -if exist $(OBJS)\ownerdrw.pdb del $(OBJS)\ownerdrw.pdb - -$(OBJS)\ownerdrw.exe: $(OWNERDRW_OBJECTS) $(OBJS)\ownerdrw_ownerdrw.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\ownerdrw.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(OWNERDRW_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (sound.png nosound.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\ownerdrw_ownerdrw.obj: .\ownerdrw.cpp - $(CXX) /c /nologo /TP /Fo$@ $(OWNERDRW_CXXFLAGS) .\ownerdrw.cpp - -$(OBJS)\ownerdrw_ownerdrw.res: .\ownerdrw.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\ownerdrw.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +OWNERDRW_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\ownerdrw.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +OWNERDRW_OBJECTS = \ + $(OBJS)\ownerdrw_ownerdrw.obj +OWNERDRW_RESOURCES = \ + $(OBJS)\ownerdrw_ownerdrw.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\ownerdrw.exe data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\ownerdrw.exe del $(OBJS)\ownerdrw.exe + -if exist $(OBJS)\ownerdrw.ilk del $(OBJS)\ownerdrw.ilk + -if exist $(OBJS)\ownerdrw.pdb del $(OBJS)\ownerdrw.pdb + +$(OBJS)\ownerdrw.exe: $(OWNERDRW_OBJECTS) $(OBJS)\ownerdrw_ownerdrw.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\ownerdrw.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(OWNERDRW_OBJECTS) $(OWNERDRW_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (sound.png nosound.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\ownerdrw_ownerdrw.obj: .\ownerdrw.cpp + $(CXX) /c /nologo /TP /Fo$@ $(OWNERDRW_CXXFLAGS) .\ownerdrw.cpp + +$(OBJS)\ownerdrw_ownerdrw.res: .\ownerdrw.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\ownerdrw.rc + diff --git a/samples/ownerdrw/makefile.wat b/samples/ownerdrw/makefile.wat index 988af60b0c..a7a599c701 100644 --- a/samples/ownerdrw/makefile.wat +++ b/samples/ownerdrw/makefile.wat @@ -1,264 +1,264 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -OWNERDRW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -OWNERDRW_OBJECTS = & - $(OBJS)\ownerdrw_ownerdrw.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\ownerdrw.exe data - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\ownerdrw.exe del $(OBJS)\ownerdrw.exe - -$(OBJS)\ownerdrw.exe : $(OWNERDRW_OBJECTS) $(OBJS)\ownerdrw_ownerdrw.res - @%create $(OBJS)\ownerdrw.lbc - @%append $(OBJS)\ownerdrw.lbc option quiet - @%append $(OBJS)\ownerdrw.lbc name $^@ - @%append $(OBJS)\ownerdrw.lbc option caseexact - @%append $(OBJS)\ownerdrw.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(OWNERDRW_OBJECTS)) do @%append $(OBJS)\ownerdrw.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\ownerdrw.lbc library %i - @%append $(OBJS)\ownerdrw.lbc option resource=$(OBJS)\ownerdrw_ownerdrw.res - @for %i in () do @%append $(OBJS)\ownerdrw.lbc option stack=%i - wlink @$(OBJS)\ownerdrw.lbc - -data : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (sound.png nosound.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\ownerdrw_ownerdrw.obj : .AUTODEPEND .\ownerdrw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(OWNERDRW_CXXFLAGS) $< - -$(OBJS)\ownerdrw_ownerdrw.res : .AUTODEPEND .\ownerdrw.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +OWNERDRW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +OWNERDRW_OBJECTS = & + $(OBJS)\ownerdrw_ownerdrw.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\ownerdrw.exe data + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\ownerdrw.exe del $(OBJS)\ownerdrw.exe + +$(OBJS)\ownerdrw.exe : $(OWNERDRW_OBJECTS) $(OBJS)\ownerdrw_ownerdrw.res + @%create $(OBJS)\ownerdrw.lbc + @%append $(OBJS)\ownerdrw.lbc option quiet + @%append $(OBJS)\ownerdrw.lbc name $^@ + @%append $(OBJS)\ownerdrw.lbc option caseexact + @%append $(OBJS)\ownerdrw.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(OWNERDRW_OBJECTS)) do @%append $(OBJS)\ownerdrw.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\ownerdrw.lbc library %i + @%append $(OBJS)\ownerdrw.lbc option resource=$(OBJS)\ownerdrw_ownerdrw.res + @for %i in () do @%append $(OBJS)\ownerdrw.lbc option stack=%i + wlink @$(OBJS)\ownerdrw.lbc + +data : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (sound.png nosound.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\ownerdrw_ownerdrw.obj : .AUTODEPEND .\ownerdrw.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(OWNERDRW_CXXFLAGS) $< + +$(OBJS)\ownerdrw_ownerdrw.res : .AUTODEPEND .\ownerdrw.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/ownerdrw/ownerdrw.dsp b/samples/ownerdrw/ownerdrw.dsp index 5ae3747da4..25e6771c50 100644 --- a/samples/ownerdrw/ownerdrw.dsp +++ b/samples/ownerdrw/ownerdrw.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\ownerdrw" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ownerdrw.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ownerdrw.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ownerdrw.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ownerdrw.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\ownerdrw" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ownerdrw.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ownerdrw.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ownerdrw.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ownerdrw.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\ownerdrw" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ownerdrw.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ownerdrw.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ownerdrw.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ownerdrw.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\ownerdrw" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\ownerdrw.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\ownerdrw.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\ownerdrw.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\ownerdrw.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/ownerdrw/ownerdrw_vc7.vcproj b/samples/ownerdrw/ownerdrw_vc7.vcproj index ebd1a64a5d..1ee00e452c 100644 --- a/samples/ownerdrw/ownerdrw_vc7.vcproj +++ b/samples/ownerdrw/ownerdrw_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\ownerdrw.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\ownerdrw.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\ownerdrw.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\ownerdrw.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\ownerdrw.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\ownerdrw.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\ownerdrw.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\ownerdrw.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\ownerdrw.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\ownerdrw.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\ownerdrw.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\ownerdrw.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -POPUP_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\popup.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -POPUP_OBJECTS = \ - $(OBJS)\popup_popup.obj \ - $(OBJS)\popup_sample.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\popup.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\popup.exe del $(OBJS)\popup.exe - -if exist $(OBJS)\popup.ilk del $(OBJS)\popup.ilk - -if exist $(OBJS)\popup.pdb del $(OBJS)\popup.pdb - -$(OBJS)\popup.exe: $(POPUP_OBJECTS) $(OBJS)\popup_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\popup.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(POPUP_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\popup_popup.obj: .\popup.cpp - $(CXX) /c /nologo /TP /Fo$@ $(POPUP_CXXFLAGS) .\popup.cpp - -$(OBJS)\popup_sample.res: .\..\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +POPUP_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\popup.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +POPUP_OBJECTS = \ + $(OBJS)\popup_popup.obj +POPUP_RESOURCES = \ + $(OBJS)\popup_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\popup.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\popup.exe del $(OBJS)\popup.exe + -if exist $(OBJS)\popup.ilk del $(OBJS)\popup.ilk + -if exist $(OBJS)\popup.pdb del $(OBJS)\popup.pdb + +$(OBJS)\popup.exe: $(POPUP_OBJECTS) $(OBJS)\popup_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\popup.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(POPUP_OBJECTS) $(POPUP_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\popup_popup.obj: .\popup.cpp + $(CXX) /c /nologo /TP /Fo$@ $(POPUP_CXXFLAGS) .\popup.cpp + +$(OBJS)\popup_sample.res: .\..\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc + diff --git a/samples/popup/makefile.wat b/samples/popup/makefile.wat index c2c3ae95e7..374209bca3 100644 --- a/samples/popup/makefile.wat +++ b/samples/popup/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -POPUP_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -POPUP_OBJECTS = & - $(OBJS)\popup_popup.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\popup.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\popup.exe del $(OBJS)\popup.exe - -$(OBJS)\popup.exe : $(POPUP_OBJECTS) $(OBJS)\popup_sample.res - @%create $(OBJS)\popup.lbc - @%append $(OBJS)\popup.lbc option quiet - @%append $(OBJS)\popup.lbc name $^@ - @%append $(OBJS)\popup.lbc option caseexact - @%append $(OBJS)\popup.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(POPUP_OBJECTS)) do @%append $(OBJS)\popup.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\popup.lbc library %i - @%append $(OBJS)\popup.lbc option resource=$(OBJS)\popup_sample.res - @for %i in () do @%append $(OBJS)\popup.lbc option stack=%i - wlink @$(OBJS)\popup.lbc - -$(OBJS)\popup_popup.obj : .AUTODEPEND .\popup.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(POPUP_CXXFLAGS) $< - -$(OBJS)\popup_sample.res : .AUTODEPEND .\..\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +POPUP_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +POPUP_OBJECTS = & + $(OBJS)\popup_popup.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\popup.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\popup.exe del $(OBJS)\popup.exe + +$(OBJS)\popup.exe : $(POPUP_OBJECTS) $(OBJS)\popup_sample.res + @%create $(OBJS)\popup.lbc + @%append $(OBJS)\popup.lbc option quiet + @%append $(OBJS)\popup.lbc name $^@ + @%append $(OBJS)\popup.lbc option caseexact + @%append $(OBJS)\popup.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(POPUP_OBJECTS)) do @%append $(OBJS)\popup.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\popup.lbc library %i + @%append $(OBJS)\popup.lbc option resource=$(OBJS)\popup_sample.res + @for %i in () do @%append $(OBJS)\popup.lbc option stack=%i + wlink @$(OBJS)\popup.lbc + +$(OBJS)\popup_popup.obj : .AUTODEPEND .\popup.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(POPUP_CXXFLAGS) $< + +$(OBJS)\popup_sample.res : .AUTODEPEND .\..\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/popup/popup.dsp b/samples/popup/popup.dsp index 6f9a083e11..06e1ee0e9d 100644 --- a/samples/popup/popup.dsp +++ b/samples/popup/popup.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\popup" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\popup.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\popup.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\popup.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\popup.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\popup" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\popup.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\popup.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\popup.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\popup.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\popup" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\popup.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\popup.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\popup.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\popup.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\popup" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\popup.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\popup.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\popup.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\popup.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/popup/popup_vc7.vcproj b/samples/popup/popup_vc7.vcproj index 8f4e8ed75b..a23a122ebb 100644 --- a/samples/popup/popup_vc7.vcproj +++ b/samples/popup/popup_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\popup.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\popup.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\popup.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\popup.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\popup.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\popup.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\popup.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\popup.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\popup.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\popup.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\popup.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\popup.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -POWER_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\power.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -POWER_OBJECTS = \ - $(OBJS)\power_sample.res \ - $(OBJS)\power_power.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\power.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\power.exe del $(OBJS)\power.exe - -if exist $(OBJS)\power.ilk del $(OBJS)\power.ilk - -if exist $(OBJS)\power.pdb del $(OBJS)\power.pdb - -$(OBJS)\power.exe: $(POWER_OBJECTS) $(OBJS)\power_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\power.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(POWER_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\power_sample.res: .\..\..\samples\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc - -$(OBJS)\power_power.obj: .\power.cpp - $(CXX) /c /nologo /TP /Fo$@ $(POWER_CXXFLAGS) .\power.cpp - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +POWER_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\power.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +POWER_OBJECTS = \ + $(OBJS)\power_power.obj +POWER_RESOURCES = \ + $(OBJS)\power_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\power.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\power.exe del $(OBJS)\power.exe + -if exist $(OBJS)\power.ilk del $(OBJS)\power.ilk + -if exist $(OBJS)\power.pdb del $(OBJS)\power.pdb + +$(OBJS)\power.exe: $(POWER_OBJECTS) $(OBJS)\power_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\power.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(POWER_OBJECTS) $(POWER_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\power_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + +$(OBJS)\power_power.obj: .\power.cpp + $(CXX) /c /nologo /TP /Fo$@ $(POWER_CXXFLAGS) .\power.cpp + diff --git a/samples/power/makefile.wat b/samples/power/makefile.wat index bf3e19a392..1921001547 100644 --- a/samples/power/makefile.wat +++ b/samples/power/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -POWER_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -POWER_OBJECTS = & - $(OBJS)\power_power.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\power.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\power.exe del $(OBJS)\power.exe - -$(OBJS)\power.exe : $(POWER_OBJECTS) $(OBJS)\power_sample.res - @%create $(OBJS)\power.lbc - @%append $(OBJS)\power.lbc option quiet - @%append $(OBJS)\power.lbc name $^@ - @%append $(OBJS)\power.lbc option caseexact - @%append $(OBJS)\power.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(POWER_OBJECTS)) do @%append $(OBJS)\power.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\power.lbc library %i - @%append $(OBJS)\power.lbc option resource=$(OBJS)\power_sample.res - @for %i in () do @%append $(OBJS)\power.lbc option stack=%i - wlink @$(OBJS)\power.lbc - -$(OBJS)\power_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - -$(OBJS)\power_power.obj : .AUTODEPEND .\power.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(POWER_CXXFLAGS) $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +POWER_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +POWER_OBJECTS = & + $(OBJS)\power_power.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\power.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\power.exe del $(OBJS)\power.exe + +$(OBJS)\power.exe : $(POWER_OBJECTS) $(OBJS)\power_sample.res + @%create $(OBJS)\power.lbc + @%append $(OBJS)\power.lbc option quiet + @%append $(OBJS)\power.lbc name $^@ + @%append $(OBJS)\power.lbc option caseexact + @%append $(OBJS)\power.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(POWER_OBJECTS)) do @%append $(OBJS)\power.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\power.lbc library %i + @%append $(OBJS)\power.lbc option resource=$(OBJS)\power_sample.res + @for %i in () do @%append $(OBJS)\power.lbc option stack=%i + wlink @$(OBJS)\power.lbc + +$(OBJS)\power_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + +$(OBJS)\power_power.obj : .AUTODEPEND .\power.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(POWER_CXXFLAGS) $< + diff --git a/samples/power/power.dsp b/samples/power/power.dsp index 6fc86e69af..ea49c06b96 100644 --- a/samples/power/power.dsp +++ b/samples/power/power.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\power" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\power.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\power.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\power" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\power.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\power.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\power" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\power.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\power.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\power" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\power.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\power.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\power.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/power/power_vc7.vcproj b/samples/power/power_vc7.vcproj index 3784598c75..93aec9723f 100644 --- a/samples/power/power_vc7.vcproj +++ b/samples/power/power_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\power.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\power.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\power.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\power.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\power.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\power.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\power.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\power.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\power.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\power.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\power.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\power.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -PRINTING_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\printing.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -PRINTING_OBJECTS = \ - $(OBJS)\printing_printing.obj \ - $(OBJS)\printing_printing.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\printing.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe - -if exist $(OBJS)\printing.ilk del $(OBJS)\printing.ilk - -if exist $(OBJS)\printing.pdb del $(OBJS)\printing.pdb - -$(OBJS)\printing.exe: $(PRINTING_OBJECTS) $(OBJS)\printing_printing.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\printing.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(PRINTING_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\printing_printing.obj: .\printing.cpp - $(CXX) /c /nologo /TP /Fo$@ $(PRINTING_CXXFLAGS) .\printing.cpp - -$(OBJS)\printing_printing.res: .\printing.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\printing.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +PRINTING_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\printing.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +PRINTING_OBJECTS = \ + $(OBJS)\printing_printing.obj +PRINTING_RESOURCES = \ + $(OBJS)\printing_printing.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\printing.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe + -if exist $(OBJS)\printing.ilk del $(OBJS)\printing.ilk + -if exist $(OBJS)\printing.pdb del $(OBJS)\printing.pdb + +$(OBJS)\printing.exe: $(PRINTING_OBJECTS) $(OBJS)\printing_printing.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\printing.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(PRINTING_OBJECTS) $(PRINTING_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\printing_printing.obj: .\printing.cpp + $(CXX) /c /nologo /TP /Fo$@ $(PRINTING_CXXFLAGS) .\printing.cpp + +$(OBJS)\printing_printing.res: .\printing.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\printing.rc + diff --git a/samples/printing/makefile.wat b/samples/printing/makefile.wat index bdf75f9f8d..41721957ff 100644 --- a/samples/printing/makefile.wat +++ b/samples/printing/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -PRINTING_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -PRINTING_OBJECTS = & - $(OBJS)\printing_printing.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\printing.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe - -$(OBJS)\printing.exe : $(PRINTING_OBJECTS) $(OBJS)\printing_printing.res - @%create $(OBJS)\printing.lbc - @%append $(OBJS)\printing.lbc option quiet - @%append $(OBJS)\printing.lbc name $^@ - @%append $(OBJS)\printing.lbc option caseexact - @%append $(OBJS)\printing.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(PRINTING_OBJECTS)) do @%append $(OBJS)\printing.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\printing.lbc library %i - @%append $(OBJS)\printing.lbc option resource=$(OBJS)\printing_printing.res - @for %i in () do @%append $(OBJS)\printing.lbc option stack=%i - wlink @$(OBJS)\printing.lbc - -$(OBJS)\printing_printing.obj : .AUTODEPEND .\printing.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PRINTING_CXXFLAGS) $< - -$(OBJS)\printing_printing.res : .AUTODEPEND .\printing.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +PRINTING_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +PRINTING_OBJECTS = & + $(OBJS)\printing_printing.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\printing.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\printing.exe del $(OBJS)\printing.exe + +$(OBJS)\printing.exe : $(PRINTING_OBJECTS) $(OBJS)\printing_printing.res + @%create $(OBJS)\printing.lbc + @%append $(OBJS)\printing.lbc option quiet + @%append $(OBJS)\printing.lbc name $^@ + @%append $(OBJS)\printing.lbc option caseexact + @%append $(OBJS)\printing.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(PRINTING_OBJECTS)) do @%append $(OBJS)\printing.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\printing.lbc library %i + @%append $(OBJS)\printing.lbc option resource=$(OBJS)\printing_printing.res + @for %i in () do @%append $(OBJS)\printing.lbc option stack=%i + wlink @$(OBJS)\printing.lbc + +$(OBJS)\printing_printing.obj : .AUTODEPEND .\printing.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(PRINTING_CXXFLAGS) $< + +$(OBJS)\printing_printing.res : .AUTODEPEND .\printing.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/printing/printing.dsp b/samples/printing/printing.dsp index 0b09aa54b1..db3837b918 100644 --- a/samples/printing/printing.dsp +++ b/samples/printing/printing.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\printing" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\printing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\printing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\printing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\printing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\printing" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\printing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\printing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\printing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\printing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\printing" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\printing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\printing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\printing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\printing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\printing" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\printing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\printing.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\printing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\printing.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/printing/printing_vc7.vcproj b/samples/printing/printing_vc7.vcproj index 1680367608..6538699f20 100644 --- a/samples/printing/printing_vc7.vcproj +++ b/samples/printing/printing_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\printing.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\printing.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\printing.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\printing.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\printing.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\printing.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\printing.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\printing.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\printing.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\printing.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\printing.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\printing.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -PROPGRID_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\propgrid.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -PROPGRID_OBJECTS = \ - $(OBJS)\propgrid_propgrid.obj \ - $(OBJS)\propgrid_propgrid_minimal.obj \ - $(OBJS)\propgrid_sampleprops.obj \ - $(OBJS)\propgrid_tests.obj \ - $(OBJS)\propgrid_sample.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_PROPGRID_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_ADV_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\propgrid.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\propgrid.exe del $(OBJS)\propgrid.exe - -if exist $(OBJS)\propgrid.ilk del $(OBJS)\propgrid.ilk - -if exist $(OBJS)\propgrid.pdb del $(OBJS)\propgrid.pdb - -$(OBJS)\propgrid.exe: $(PROPGRID_OBJECTS) $(OBJS)\propgrid_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\propgrid.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(PROPGRID_OBJECTS) $(__WXLIB_PROPGRID_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\propgrid_propgrid.obj: .\propgrid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(PROPGRID_CXXFLAGS) .\propgrid.cpp - -$(OBJS)\propgrid_propgrid_minimal.obj: .\propgrid_minimal.cpp - $(CXX) /c /nologo /TP /Fo$@ $(PROPGRID_CXXFLAGS) .\propgrid_minimal.cpp - -$(OBJS)\propgrid_sampleprops.obj: .\sampleprops.cpp - $(CXX) /c /nologo /TP /Fo$@ $(PROPGRID_CXXFLAGS) .\sampleprops.cpp - -$(OBJS)\propgrid_tests.obj: .\tests.cpp - $(CXX) /c /nologo /TP /Fo$@ $(PROPGRID_CXXFLAGS) .\tests.cpp - -$(OBJS)\propgrid_sample.res: .\..\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +PROPGRID_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\propgrid.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +PROPGRID_OBJECTS = \ + $(OBJS)\propgrid_propgrid.obj \ + $(OBJS)\propgrid_propgrid_minimal.obj \ + $(OBJS)\propgrid_sampleprops.obj \ + $(OBJS)\propgrid_tests.obj +PROPGRID_RESOURCES = \ + $(OBJS)\propgrid_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_PROPGRID_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_ADV_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\propgrid.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\propgrid.exe del $(OBJS)\propgrid.exe + -if exist $(OBJS)\propgrid.ilk del $(OBJS)\propgrid.ilk + -if exist $(OBJS)\propgrid.pdb del $(OBJS)\propgrid.pdb + +$(OBJS)\propgrid.exe: $(PROPGRID_OBJECTS) $(OBJS)\propgrid_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\propgrid.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(PROPGRID_OBJECTS) $(PROPGRID_RESOURCES) $(__WXLIB_PROPGRID_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\propgrid_propgrid.obj: .\propgrid.cpp + $(CXX) /c /nologo /TP /Fo$@ $(PROPGRID_CXXFLAGS) .\propgrid.cpp + +$(OBJS)\propgrid_propgrid_minimal.obj: .\propgrid_minimal.cpp + $(CXX) /c /nologo /TP /Fo$@ $(PROPGRID_CXXFLAGS) .\propgrid_minimal.cpp + +$(OBJS)\propgrid_sampleprops.obj: .\sampleprops.cpp + $(CXX) /c /nologo /TP /Fo$@ $(PROPGRID_CXXFLAGS) .\sampleprops.cpp + +$(OBJS)\propgrid_tests.obj: .\tests.cpp + $(CXX) /c /nologo /TP /Fo$@ $(PROPGRID_CXXFLAGS) .\tests.cpp + +$(OBJS)\propgrid_sample.res: .\..\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc + diff --git a/samples/propgrid/makefile.wat b/samples/propgrid/makefile.wat index 1c6cb222c8..6416a78933 100644 --- a/samples/propgrid/makefile.wat +++ b/samples/propgrid/makefile.wat @@ -1,282 +1,282 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_PROPGRID_p = -!ifeq MONOLITHIC 0 -__WXLIB_PROPGRID_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib -!endif -__WXLIB_ADV_p = -!ifeq MONOLITHIC 0 -__WXLIB_ADV_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -PROPGRID_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -PROPGRID_OBJECTS = & - $(OBJS)\propgrid_propgrid.obj & - $(OBJS)\propgrid_propgrid_minimal.obj & - $(OBJS)\propgrid_sampleprops.obj & - $(OBJS)\propgrid_tests.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\propgrid.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\propgrid.exe del $(OBJS)\propgrid.exe - -$(OBJS)\propgrid.exe : $(PROPGRID_OBJECTS) $(OBJS)\propgrid_sample.res - @%create $(OBJS)\propgrid.lbc - @%append $(OBJS)\propgrid.lbc option quiet - @%append $(OBJS)\propgrid.lbc name $^@ - @%append $(OBJS)\propgrid.lbc option caseexact - @%append $(OBJS)\propgrid.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(PROPGRID_OBJECTS)) do @%append $(OBJS)\propgrid.lbc file %i - @for %i in ( $(__WXLIB_PROPGRID_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\propgrid.lbc library %i - @%append $(OBJS)\propgrid.lbc option resource=$(OBJS)\propgrid_sample.res - @for %i in () do @%append $(OBJS)\propgrid.lbc option stack=%i - wlink @$(OBJS)\propgrid.lbc - -$(OBJS)\propgrid_propgrid.obj : .AUTODEPEND .\propgrid.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRID_CXXFLAGS) $< - -$(OBJS)\propgrid_propgrid_minimal.obj : .AUTODEPEND .\propgrid_minimal.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRID_CXXFLAGS) $< - -$(OBJS)\propgrid_sampleprops.obj : .AUTODEPEND .\sampleprops.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRID_CXXFLAGS) $< - -$(OBJS)\propgrid_tests.obj : .AUTODEPEND .\tests.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRID_CXXFLAGS) $< - -$(OBJS)\propgrid_sample.res : .AUTODEPEND .\..\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_PROPGRID_p = +!ifeq MONOLITHIC 0 +__WXLIB_PROPGRID_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib +!endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +PROPGRID_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +PROPGRID_OBJECTS = & + $(OBJS)\propgrid_propgrid.obj & + $(OBJS)\propgrid_propgrid_minimal.obj & + $(OBJS)\propgrid_sampleprops.obj & + $(OBJS)\propgrid_tests.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\propgrid.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\propgrid.exe del $(OBJS)\propgrid.exe + +$(OBJS)\propgrid.exe : $(PROPGRID_OBJECTS) $(OBJS)\propgrid_sample.res + @%create $(OBJS)\propgrid.lbc + @%append $(OBJS)\propgrid.lbc option quiet + @%append $(OBJS)\propgrid.lbc name $^@ + @%append $(OBJS)\propgrid.lbc option caseexact + @%append $(OBJS)\propgrid.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(PROPGRID_OBJECTS)) do @%append $(OBJS)\propgrid.lbc file %i + @for %i in ( $(__WXLIB_PROPGRID_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\propgrid.lbc library %i + @%append $(OBJS)\propgrid.lbc option resource=$(OBJS)\propgrid_sample.res + @for %i in () do @%append $(OBJS)\propgrid.lbc option stack=%i + wlink @$(OBJS)\propgrid.lbc + +$(OBJS)\propgrid_propgrid.obj : .AUTODEPEND .\propgrid.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRID_CXXFLAGS) $< + +$(OBJS)\propgrid_propgrid_minimal.obj : .AUTODEPEND .\propgrid_minimal.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRID_CXXFLAGS) $< + +$(OBJS)\propgrid_sampleprops.obj : .AUTODEPEND .\sampleprops.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRID_CXXFLAGS) $< + +$(OBJS)\propgrid_tests.obj : .AUTODEPEND .\tests.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRID_CXXFLAGS) $< + +$(OBJS)\propgrid_sample.res : .AUTODEPEND .\..\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/propgrid/propgrid.dsp b/samples/propgrid/propgrid.dsp index a29e2ae817..db1f6623cb 100644 --- a/samples/propgrid/propgrid.dsp +++ b/samples/propgrid/propgrid.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\propgrid" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\propgrid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\propgrid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\propgrid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\propgrid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\propgrid" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\propgrid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\propgrid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\propgrid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\propgrid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\propgrid" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\propgrid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\propgrid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\propgrid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\propgrid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\propgrid" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\propgrid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\propgrid.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\propgrid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\propgrid.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/propgrid/propgrid_vc7.vcproj b/samples/propgrid/propgrid_vc7.vcproj index f18a476b4d..a53e191a4c 100644 --- a/samples/propgrid/propgrid_vc7.vcproj +++ b/samples/propgrid/propgrid_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\propgrid.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\propgrid.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\propgrid.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\propgrid.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\propgrid.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\propgrid.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\propgrid.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\propgrid.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\propgrid.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\propgrid.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\propgrid.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\propgrid.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -REGTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\regtest.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -REGTEST_OBJECTS = \ - $(OBJS)\regtest_regtest.obj \ - $(OBJS)\regtest_regtest.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\regtest.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\regtest.exe del $(OBJS)\regtest.exe - -if exist $(OBJS)\regtest.ilk del $(OBJS)\regtest.ilk - -if exist $(OBJS)\regtest.pdb del $(OBJS)\regtest.pdb - -$(OBJS)\regtest.exe: $(REGTEST_OBJECTS) $(OBJS)\regtest_regtest.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\regtest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(REGTEST_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\regtest_regtest.obj: .\regtest.cpp - $(CXX) /c /nologo /TP /Fo$@ $(REGTEST_CXXFLAGS) .\regtest.cpp - -$(OBJS)\regtest_regtest.res: .\regtest.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\regtest.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +REGTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\regtest.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +REGTEST_OBJECTS = \ + $(OBJS)\regtest_regtest.obj +REGTEST_RESOURCES = \ + $(OBJS)\regtest_regtest.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\regtest.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\regtest.exe del $(OBJS)\regtest.exe + -if exist $(OBJS)\regtest.ilk del $(OBJS)\regtest.ilk + -if exist $(OBJS)\regtest.pdb del $(OBJS)\regtest.pdb + +$(OBJS)\regtest.exe: $(REGTEST_OBJECTS) $(OBJS)\regtest_regtest.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\regtest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(REGTEST_OBJECTS) $(REGTEST_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\regtest_regtest.obj: .\regtest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(REGTEST_CXXFLAGS) .\regtest.cpp + +$(OBJS)\regtest_regtest.res: .\regtest.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\regtest.rc + diff --git a/samples/regtest/makefile.wat b/samples/regtest/makefile.wat index f1dfed752b..41664d2fcf 100644 --- a/samples/regtest/makefile.wat +++ b/samples/regtest/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -REGTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -REGTEST_OBJECTS = & - $(OBJS)\regtest_regtest.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\regtest.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\regtest.exe del $(OBJS)\regtest.exe - -$(OBJS)\regtest.exe : $(REGTEST_OBJECTS) $(OBJS)\regtest_regtest.res - @%create $(OBJS)\regtest.lbc - @%append $(OBJS)\regtest.lbc option quiet - @%append $(OBJS)\regtest.lbc name $^@ - @%append $(OBJS)\regtest.lbc option caseexact - @%append $(OBJS)\regtest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(REGTEST_OBJECTS)) do @%append $(OBJS)\regtest.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\regtest.lbc library %i - @%append $(OBJS)\regtest.lbc option resource=$(OBJS)\regtest_regtest.res - @for %i in () do @%append $(OBJS)\regtest.lbc option stack=%i - wlink @$(OBJS)\regtest.lbc - -$(OBJS)\regtest_regtest.obj : .AUTODEPEND .\regtest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(REGTEST_CXXFLAGS) $< - -$(OBJS)\regtest_regtest.res : .AUTODEPEND .\regtest.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +REGTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +REGTEST_OBJECTS = & + $(OBJS)\regtest_regtest.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\regtest.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\regtest.exe del $(OBJS)\regtest.exe + +$(OBJS)\regtest.exe : $(REGTEST_OBJECTS) $(OBJS)\regtest_regtest.res + @%create $(OBJS)\regtest.lbc + @%append $(OBJS)\regtest.lbc option quiet + @%append $(OBJS)\regtest.lbc name $^@ + @%append $(OBJS)\regtest.lbc option caseexact + @%append $(OBJS)\regtest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(REGTEST_OBJECTS)) do @%append $(OBJS)\regtest.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\regtest.lbc library %i + @%append $(OBJS)\regtest.lbc option resource=$(OBJS)\regtest_regtest.res + @for %i in () do @%append $(OBJS)\regtest.lbc option stack=%i + wlink @$(OBJS)\regtest.lbc + +$(OBJS)\regtest_regtest.obj : .AUTODEPEND .\regtest.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(REGTEST_CXXFLAGS) $< + +$(OBJS)\regtest_regtest.res : .AUTODEPEND .\regtest.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/regtest/regtest.dsp b/samples/regtest/regtest.dsp index 12f28aa319..bd947191c2 100644 --- a/samples/regtest/regtest.dsp +++ b/samples/regtest/regtest.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\regtest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\regtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\regtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\regtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\regtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\regtest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\regtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\regtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\regtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\regtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\regtest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\regtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\regtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\regtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\regtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\regtest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\regtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\regtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\regtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\regtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/regtest/regtest_vc7.vcproj b/samples/regtest/regtest_vc7.vcproj index fccd4fc869..effe2948fe 100644 --- a/samples/regtest/regtest_vc7.vcproj +++ b/samples/regtest/regtest_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\regtest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\regtest.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\regtest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\regtest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\regtest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\regtest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\regtest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\regtest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\regtest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\regtest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\regtest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\regtest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -RENDER_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) /Fd$(OBJS)\render.pdb $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \ - /I.\..\..\samples /DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \ - $(CXXFLAGS) -RENDER_OBJECTS = \ - $(OBJS)\render_sample.res \ - $(OBJS)\render_render.obj -RENDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_23)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ - /DWXUSINGDLL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -RENDDLL_OBJECTS = \ - $(OBJS)\renddll_renddll.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG) -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__renddll___depname = \ - $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.dll -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_23 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_23 = $(__THREADSFLAG) -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG = T -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\render.exe $(__renddll___depname) - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\render.exe del $(OBJS)\render.exe - -if exist $(OBJS)\render.ilk del $(OBJS)\render.ilk - -if exist $(OBJS)\render.pdb del $(OBJS)\render.pdb - -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.dll del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.dll - -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.ilk del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.ilk - -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.pdb del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.pdb - -$(OBJS)\render.exe: $(RENDER_OBJECTS) $(OBJS)\render_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\render.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(RENDER_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -!if "$(SHARED)" == "1" -$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.dll: $(RENDDLL_OBJECTS) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< - $(RENDDLL_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< -!endif - -$(OBJS)\render_sample.res: .\..\..\samples\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc - -$(OBJS)\render_render.obj: .\render.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RENDER_CXXFLAGS) .\render.cpp - -$(OBJS)\renddll_renddll.obj: .\renddll.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RENDDLL_CXXFLAGS) .\renddll.cpp - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +RENDER_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 \ + $(__DEBUGINFO) /Fd$(OBJS)\render.pdb $(__DEBUGINFO_2) $(____DEBUGRUNTIME) \ + $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + $(CPPFLAGS) $(CXXFLAGS) +RENDER_OBJECTS = \ + $(OBJS)\render_render.obj +RENDER_RESOURCES = \ + $(OBJS)\render_sample.res +RENDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_27)$(__DEBUGRUNTIME) /DWIN32 \ + $(__DEBUGINFO) \ + /Fd$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.pdb \ + $(__DEBUGINFO_19) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) \ + /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ + $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ + /I$(SETUPHDIR) /I.\..\..\include /W4 /DWXUSINGDLL $(__RTTIFLAG) \ + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) +RENDDLL_OBJECTS = \ + $(OBJS)\renddll_renddll.obj + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_0) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_0) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__renddll___depname = \ + $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.dll +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_19 = $(__DEBUGRUNTIME_0) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_19 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_19 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_19 = $(__DEBUGRUNTIME_0) +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_27 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_27 = $(__THREADSFLAG) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_0 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_0 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_0 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_0 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG = T +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\render.exe $(__renddll___depname) + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\render.exe del $(OBJS)\render.exe + -if exist $(OBJS)\render.ilk del $(OBJS)\render.ilk + -if exist $(OBJS)\render.pdb del $(OBJS)\render.pdb + -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.dll del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.dll + -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.ilk del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.ilk + -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.pdb del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.pdb + +$(OBJS)\render.exe: $(RENDER_OBJECTS) $(OBJS)\render_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\render.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(RENDER_OBJECTS) $(RENDER_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +!if "$(SHARED)" == "1" +$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.dll: $(RENDDLL_OBJECTS) + link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_vc.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(LDFLAGS) @<< + $(RENDDLL_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< +!endif + +$(OBJS)\render_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + +$(OBJS)\render_render.obj: .\render.cpp + $(CXX) /c /nologo /TP /Fo$@ $(RENDER_CXXFLAGS) .\render.cpp + +$(OBJS)\renddll_renddll.obj: .\renddll.cpp + $(CXX) /c /nologo /TP /Fo$@ $(RENDDLL_CXXFLAGS) .\renddll.cpp + diff --git a/samples/render/makefile.wat b/samples/render/makefile.wat index fc8a234b38..6ab7a7b411 100644 --- a/samples/render/makefile.wat +++ b/samples/render/makefile.wat @@ -1,292 +1,292 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__renddll___depname = -!ifeq SHARED 1 -__renddll___depname = & - $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_wat.dll -!endif -__DEBUGINFO = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG = -!ifeq BUILD debug -__OPTIMIZEFLAG = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG = -ot -ox -!endif -__THREADSFLAG = -!ifeq USE_THREADS 0 -__THREADSFLAG = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG = -bm -!endif -__RUNTIME_LIBS = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS = -!endif -__RTTIFLAG = -!ifeq USE_RTTI 0 -__RTTIFLAG = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG = -xr -!endif -__EXCEPTIONSFLAG = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG = -xs -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -RENDER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & - $(CXXFLAGS) -RENDER_OBJECTS = & - $(OBJS)\render_render.obj -RENDDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXUSINGDLL & - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -RENDDLL_OBJECTS = & - $(OBJS)\renddll_renddll.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\render.exe $(__renddll___depname) - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\render.exe del $(OBJS)\render.exe - -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_wat.dll del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_wat.dll - -$(OBJS)\render.exe : $(RENDER_OBJECTS) $(OBJS)\render_sample.res - @%create $(OBJS)\render.lbc - @%append $(OBJS)\render.lbc option quiet - @%append $(OBJS)\render.lbc name $^@ - @%append $(OBJS)\render.lbc option caseexact - @%append $(OBJS)\render.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(RENDER_OBJECTS)) do @%append $(OBJS)\render.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\render.lbc library %i - @%append $(OBJS)\render.lbc option resource=$(OBJS)\render_sample.res - @for %i in () do @%append $(OBJS)\render.lbc option stack=%i - wlink @$(OBJS)\render.lbc - -!ifeq SHARED 1 -$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_wat.dll : $(RENDDLL_OBJECTS) - @%create $(OBJS)\renddll.lbc - @%append $(OBJS)\renddll.lbc option quiet - @%append $(OBJS)\renddll.lbc name $^@ - @%append $(OBJS)\renddll.lbc option caseexact - @%append $(OBJS)\renddll.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) $(LDFLAGS) - @for %i in ($(RENDDLL_OBJECTS)) do @%append $(OBJS)\renddll.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\renddll.lbc library %i - @%append $(OBJS)\renddll.lbc - @%append $(OBJS)\renddll.lbc system nt_dll - wlink @$(OBJS)\renddll.lbc -!endif - -$(OBJS)\render_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - -$(OBJS)\render_render.obj : .AUTODEPEND .\render.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RENDER_CXXFLAGS) $< - -$(OBJS)\renddll_renddll.obj : .AUTODEPEND .\renddll.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RENDDLL_CXXFLAGS) $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__renddll___depname = +!ifeq SHARED 1 +__renddll___depname = & + $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_wat.dll +!endif +__DEBUGINFO = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG = +!ifeq BUILD debug +__OPTIMIZEFLAG = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG = -ot -ox +!endif +__THREADSFLAG = +!ifeq USE_THREADS 0 +__THREADSFLAG = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG = -bm +!endif +__RUNTIME_LIBS = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS = +!endif +__RTTIFLAG = +!ifeq USE_RTTI 0 +__RTTIFLAG = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG = -xr +!endif +__EXCEPTIONSFLAG = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG = -xs +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +RENDER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & + $(CXXFLAGS) +RENDER_OBJECTS = & + $(OBJS)\render_render.obj +RENDDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -dWXUSINGDLL & + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) +RENDDLL_OBJECTS = & + $(OBJS)\renddll_renddll.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\render.exe $(__renddll___depname) + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\render.exe del $(OBJS)\render.exe + -if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_wat.dll del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_wat.dll + +$(OBJS)\render.exe : $(RENDER_OBJECTS) $(OBJS)\render_sample.res + @%create $(OBJS)\render.lbc + @%append $(OBJS)\render.lbc option quiet + @%append $(OBJS)\render.lbc name $^@ + @%append $(OBJS)\render.lbc option caseexact + @%append $(OBJS)\render.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(RENDER_OBJECTS)) do @%append $(OBJS)\render.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\render.lbc library %i + @%append $(OBJS)\render.lbc option resource=$(OBJS)\render_sample.res + @for %i in () do @%append $(OBJS)\render.lbc option stack=%i + wlink @$(OBJS)\render.lbc + +!ifeq SHARED 1 +$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_wat.dll : $(RENDDLL_OBJECTS) + @%create $(OBJS)\renddll.lbc + @%append $(OBJS)\renddll.lbc option quiet + @%append $(OBJS)\renddll.lbc name $^@ + @%append $(OBJS)\renddll.lbc option caseexact + @%append $(OBJS)\renddll.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) $(LDFLAGS) + @for %i in ($(RENDDLL_OBJECTS)) do @%append $(OBJS)\renddll.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\renddll.lbc library %i + @%append $(OBJS)\renddll.lbc + @%append $(OBJS)\renddll.lbc system nt_dll + wlink @$(OBJS)\renddll.lbc +!endif + +$(OBJS)\render_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + +$(OBJS)\render_render.obj : .AUTODEPEND .\render.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(RENDER_CXXFLAGS) $< + +$(OBJS)\renddll_renddll.obj : .AUTODEPEND .\renddll.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(RENDDLL_CXXFLAGS) $< + diff --git a/samples/render/render_renddll.dsp b/samples/render/render_renddll.dsp index 027ef8236d..7f5a634eb7 100644 --- a/samples/render/render_renddll.dsp +++ b/samples/render/render_renddll.dsp @@ -43,8 +43,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\renddll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /Zi /Fdvc_mswunivudll\renddll_mswunivu291_vc.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /Zi /Fdvc_mswunivudll\renddll_mswunivu291_vc.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /Zi /Fdvc_mswunivudll\renddll_mswunivu291_vc.pdb /opt:ref /opt:icf /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /Zi /Fdvc_mswunivudll\renddll_mswunivu291_vc.pdb /opt:ref /opt:icf /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /d WXUSINGDLL @@ -93,8 +93,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\renddll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /Zi /Fdvc_mswudll\renddll_mswu291_vc.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /c -# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /Zi /Fdvc_mswudll\renddll_mswu291_vc.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /c +# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /Zi /Fdvc_mswudll\renddll_mswu291_vc.pdb /opt:ref /opt:icf /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /c +# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /Zi /Fdvc_mswudll\renddll_mswu291_vc.pdb /opt:ref /opt:icf /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /d WXUSINGDLL diff --git a/samples/render/render_render.dsp b/samples/render/render_render.dsp index 79fabdd428..e5ccf97564 100644 --- a/samples/render/render_render.dsp +++ b/samples/render/render_render.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\render" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\render.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\render.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\render.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\render.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\render" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\render.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\render.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\render.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\render.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\render" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\render.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\render.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\render.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\render.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\render" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\render.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\render.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\render.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\render.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/render/render_vc7_renddll.vcproj b/samples/render/render_vc7_renddll.vcproj index 24317684a4..268416864f 100644 --- a/samples/render/render_vc7_renddll.vcproj +++ b/samples/render/render_vc7_renddll.vcproj @@ -2,7 +2,7 @@ @@ -109,12 +109,14 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\renddll_mswu291_vc.dll" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswudll\renddll_mswu291_vc.pdb" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\render.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\render.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -169,13 +169,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\renddll_mswu291_vc.dll" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" ProgramDatabaseFile="vc_mswudll\renddll_mswu291_vc.pdb" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\render.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\render.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -132,7 +132,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -168,13 +168,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\renddll_mswu291_vc.dll" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" ProgramDatabaseFile="vc_mswudll\renddll_mswu291_vc.pdb" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -308,7 +310,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -344,13 +346,15 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\renddll_mswunivu291_vc.dll" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" GenerateDebugInformation="true" ProgramDatabaseFile="vc_mswunivudll\renddll_mswunivu291_vc.pdb" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\render.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\render.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\render.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\render.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\render.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\render.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\render.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\render.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -RIBBON_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\ribbon.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -RIBBON_OBJECTS = \ - $(OBJS)\ribbon_ribbondemo.obj \ - $(OBJS)\ribbon_sample.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_RIBBON_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_ADV_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\ribbon.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\ribbon.exe del $(OBJS)\ribbon.exe - -if exist $(OBJS)\ribbon.ilk del $(OBJS)\ribbon.ilk - -if exist $(OBJS)\ribbon.pdb del $(OBJS)\ribbon.pdb - -$(OBJS)\ribbon.exe: $(RIBBON_OBJECTS) $(OBJS)\ribbon_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\ribbon.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(RIBBON_OBJECTS) $(__WXLIB_RIBBON_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\ribbon_ribbondemo.obj: .\ribbondemo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RIBBON_CXXFLAGS) .\ribbondemo.cpp - -$(OBJS)\ribbon_sample.res: .\..\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +RIBBON_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\ribbon.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +RIBBON_OBJECTS = \ + $(OBJS)\ribbon_ribbondemo.obj +RIBBON_RESOURCES = \ + $(OBJS)\ribbon_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_RIBBON_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_ADV_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\ribbon.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\ribbon.exe del $(OBJS)\ribbon.exe + -if exist $(OBJS)\ribbon.ilk del $(OBJS)\ribbon.ilk + -if exist $(OBJS)\ribbon.pdb del $(OBJS)\ribbon.pdb + +$(OBJS)\ribbon.exe: $(RIBBON_OBJECTS) $(OBJS)\ribbon_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\ribbon.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(RIBBON_OBJECTS) $(RIBBON_RESOURCES) $(__WXLIB_RIBBON_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\ribbon_ribbondemo.obj: .\ribbondemo.cpp + $(CXX) /c /nologo /TP /Fo$@ $(RIBBON_CXXFLAGS) .\ribbondemo.cpp + +$(OBJS)\ribbon_sample.res: .\..\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc + diff --git a/samples/ribbon/makefile.wat b/samples/ribbon/makefile.wat index bd911ba2e1..c238cc036c 100644 --- a/samples/ribbon/makefile.wat +++ b/samples/ribbon/makefile.wat @@ -1,270 +1,270 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_RIBBON_p = -!ifeq MONOLITHIC 0 -__WXLIB_RIBBON_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib -!endif -__WXLIB_ADV_p = -!ifeq MONOLITHIC 0 -__WXLIB_ADV_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -RIBBON_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -RIBBON_OBJECTS = & - $(OBJS)\ribbon_ribbondemo.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\ribbon.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\ribbon.exe del $(OBJS)\ribbon.exe - -$(OBJS)\ribbon.exe : $(RIBBON_OBJECTS) $(OBJS)\ribbon_sample.res - @%create $(OBJS)\ribbon.lbc - @%append $(OBJS)\ribbon.lbc option quiet - @%append $(OBJS)\ribbon.lbc name $^@ - @%append $(OBJS)\ribbon.lbc option caseexact - @%append $(OBJS)\ribbon.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(RIBBON_OBJECTS)) do @%append $(OBJS)\ribbon.lbc file %i - @for %i in ( $(__WXLIB_RIBBON_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\ribbon.lbc library %i - @%append $(OBJS)\ribbon.lbc option resource=$(OBJS)\ribbon_sample.res - @for %i in () do @%append $(OBJS)\ribbon.lbc option stack=%i - wlink @$(OBJS)\ribbon.lbc - -$(OBJS)\ribbon_ribbondemo.obj : .AUTODEPEND .\ribbondemo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RIBBON_CXXFLAGS) $< - -$(OBJS)\ribbon_sample.res : .AUTODEPEND .\..\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_RIBBON_p = +!ifeq MONOLITHIC 0 +__WXLIB_RIBBON_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib +!endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +RIBBON_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +RIBBON_OBJECTS = & + $(OBJS)\ribbon_ribbondemo.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\ribbon.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\ribbon.exe del $(OBJS)\ribbon.exe + +$(OBJS)\ribbon.exe : $(RIBBON_OBJECTS) $(OBJS)\ribbon_sample.res + @%create $(OBJS)\ribbon.lbc + @%append $(OBJS)\ribbon.lbc option quiet + @%append $(OBJS)\ribbon.lbc name $^@ + @%append $(OBJS)\ribbon.lbc option caseexact + @%append $(OBJS)\ribbon.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(RIBBON_OBJECTS)) do @%append $(OBJS)\ribbon.lbc file %i + @for %i in ( $(__WXLIB_RIBBON_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\ribbon.lbc library %i + @%append $(OBJS)\ribbon.lbc option resource=$(OBJS)\ribbon_sample.res + @for %i in () do @%append $(OBJS)\ribbon.lbc option stack=%i + wlink @$(OBJS)\ribbon.lbc + +$(OBJS)\ribbon_ribbondemo.obj : .AUTODEPEND .\ribbondemo.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(RIBBON_CXXFLAGS) $< + +$(OBJS)\ribbon_sample.res : .AUTODEPEND .\..\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/ribbon/ribbon.dsp b/samples/ribbon/ribbon.dsp index 41e4537eb8..34a505406b 100644 --- a/samples/ribbon/ribbon.dsp +++ b/samples/ribbon/ribbon.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\ribbon" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ribbon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ribbon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ribbon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ribbon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\ribbon" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ribbon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ribbon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ribbon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ribbon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\ribbon" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ribbon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ribbon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ribbon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ribbon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\ribbon" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\ribbon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\ribbon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\ribbon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\ribbon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/ribbon/ribbon_vc7.vcproj b/samples/ribbon/ribbon_vc7.vcproj index dbf44c2120..120ed0b787 100644 --- a/samples/ribbon/ribbon_vc7.vcproj +++ b/samples/ribbon/ribbon_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_ribbon.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\ribbon.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\ribbon.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_ribbon.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\ribbon.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\ribbon.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_ribbon.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\ribbon.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\ribbon.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_ribbon.lib wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\ribbon.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\ribbon.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_ribbon.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\ribbon.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\ribbon.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_ribbon.lib wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\ribbon.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\ribbon.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -RICHTEXT_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\richtext.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -RICHTEXT_OBJECTS = \ - $(OBJS)\richtext_richtext.obj \ - $(OBJS)\richtext_sample.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_RICHTEXT_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_ADV_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_HTML_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_XML_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\richtext.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\richtext.exe del $(OBJS)\richtext.exe - -if exist $(OBJS)\richtext.ilk del $(OBJS)\richtext.ilk - -if exist $(OBJS)\richtext.pdb del $(OBJS)\richtext.pdb - -$(OBJS)\richtext.exe: $(RICHTEXT_OBJECTS) $(OBJS)\richtext_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\richtext.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(RICHTEXT_OBJECTS) $(__WXLIB_RICHTEXT_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\richtext_richtext.obj: .\richtext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXT_CXXFLAGS) .\richtext.cpp - -$(OBJS)\richtext_sample.res: .\..\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +RICHTEXT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\richtext.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +RICHTEXT_OBJECTS = \ + $(OBJS)\richtext_richtext.obj +RICHTEXT_RESOURCES = \ + $(OBJS)\richtext_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_RICHTEXT_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_ADV_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_XML_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\richtext.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\richtext.exe del $(OBJS)\richtext.exe + -if exist $(OBJS)\richtext.ilk del $(OBJS)\richtext.ilk + -if exist $(OBJS)\richtext.pdb del $(OBJS)\richtext.pdb + +$(OBJS)\richtext.exe: $(RICHTEXT_OBJECTS) $(OBJS)\richtext_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\richtext.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(RICHTEXT_OBJECTS) $(RICHTEXT_RESOURCES) $(__WXLIB_RICHTEXT_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\richtext_richtext.obj: .\richtext.cpp + $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXT_CXXFLAGS) .\richtext.cpp + +$(OBJS)\richtext_sample.res: .\..\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc + diff --git a/samples/richtext/makefile.wat b/samples/richtext/makefile.wat index f395be9182..ee26be301b 100644 --- a/samples/richtext/makefile.wat +++ b/samples/richtext/makefile.wat @@ -1,280 +1,280 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_RICHTEXT_p = -!ifeq MONOLITHIC 0 -__WXLIB_RICHTEXT_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib -!endif -__WXLIB_ADV_p = -!ifeq MONOLITHIC 0 -__WXLIB_ADV_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_XML_p = -!ifeq MONOLITHIC 0 -__WXLIB_XML_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -RICHTEXT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -RICHTEXT_OBJECTS = & - $(OBJS)\richtext_richtext.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\richtext.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\richtext.exe del $(OBJS)\richtext.exe - -$(OBJS)\richtext.exe : $(RICHTEXT_OBJECTS) $(OBJS)\richtext_sample.res - @%create $(OBJS)\richtext.lbc - @%append $(OBJS)\richtext.lbc option quiet - @%append $(OBJS)\richtext.lbc name $^@ - @%append $(OBJS)\richtext.lbc option caseexact - @%append $(OBJS)\richtext.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(RICHTEXT_OBJECTS)) do @%append $(OBJS)\richtext.lbc file %i - @for %i in ( $(__WXLIB_RICHTEXT_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\richtext.lbc library %i - @%append $(OBJS)\richtext.lbc option resource=$(OBJS)\richtext_sample.res - @for %i in () do @%append $(OBJS)\richtext.lbc option stack=%i - wlink @$(OBJS)\richtext.lbc - -$(OBJS)\richtext_richtext.obj : .AUTODEPEND .\richtext.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXT_CXXFLAGS) $< - -$(OBJS)\richtext_sample.res : .AUTODEPEND .\..\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_RICHTEXT_p = +!ifeq MONOLITHIC 0 +__WXLIB_RICHTEXT_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib +!endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_XML_p = +!ifeq MONOLITHIC 0 +__WXLIB_XML_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +RICHTEXT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +RICHTEXT_OBJECTS = & + $(OBJS)\richtext_richtext.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\richtext.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\richtext.exe del $(OBJS)\richtext.exe + +$(OBJS)\richtext.exe : $(RICHTEXT_OBJECTS) $(OBJS)\richtext_sample.res + @%create $(OBJS)\richtext.lbc + @%append $(OBJS)\richtext.lbc option quiet + @%append $(OBJS)\richtext.lbc name $^@ + @%append $(OBJS)\richtext.lbc option caseexact + @%append $(OBJS)\richtext.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(RICHTEXT_OBJECTS)) do @%append $(OBJS)\richtext.lbc file %i + @for %i in ( $(__WXLIB_RICHTEXT_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\richtext.lbc library %i + @%append $(OBJS)\richtext.lbc option resource=$(OBJS)\richtext_sample.res + @for %i in () do @%append $(OBJS)\richtext.lbc option stack=%i + wlink @$(OBJS)\richtext.lbc + +$(OBJS)\richtext_richtext.obj : .AUTODEPEND .\richtext.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXT_CXXFLAGS) $< + +$(OBJS)\richtext_sample.res : .AUTODEPEND .\..\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/richtext/richtext.dsp b/samples/richtext/richtext.dsp index 1c682edfe5..7a10a42d26 100644 --- a/samples/richtext/richtext.dsp +++ b/samples/richtext/richtext.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\richtext" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\richtext.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\richtext.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\richtext.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\richtext.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\richtext" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\richtext.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\richtext.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\richtext.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\richtext.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\richtext" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\richtext.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\richtext.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\richtext.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\richtext.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\richtext" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\richtext.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\richtext.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\richtext.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\richtext.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/richtext/richtext_vc7.vcproj b/samples/richtext/richtext_vc7.vcproj index 066cf5a6c2..9f1f4b56cd 100644 --- a/samples/richtext/richtext_vc7.vcproj +++ b/samples/richtext/richtext_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\richtext.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\richtext.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\richtext.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\richtext.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\richtext.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\richtext.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\richtext.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\richtext.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\richtext.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\richtext.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\richtext.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\richtext.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SASHTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\sashtest.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -SASHTEST_OBJECTS = \ - $(OBJS)\sashtest_sashtest.obj \ - $(OBJS)\sashtest_sashtest.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_ADV_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\sashtest.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\sashtest.exe del $(OBJS)\sashtest.exe - -if exist $(OBJS)\sashtest.ilk del $(OBJS)\sashtest.ilk - -if exist $(OBJS)\sashtest.pdb del $(OBJS)\sashtest.pdb - -$(OBJS)\sashtest.exe: $(SASHTEST_OBJECTS) $(OBJS)\sashtest_sashtest.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\sashtest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(SASHTEST_OBJECTS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\sashtest_sashtest.obj: .\sashtest.cpp - $(CXX) /c /nologo /TP /Fo$@ $(SASHTEST_CXXFLAGS) .\sashtest.cpp - -$(OBJS)\sashtest_sashtest.res: .\sashtest.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\sashtest.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +SASHTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\sashtest.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +SASHTEST_OBJECTS = \ + $(OBJS)\sashtest_sashtest.obj +SASHTEST_RESOURCES = \ + $(OBJS)\sashtest_sashtest.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_ADV_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\sashtest.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\sashtest.exe del $(OBJS)\sashtest.exe + -if exist $(OBJS)\sashtest.ilk del $(OBJS)\sashtest.ilk + -if exist $(OBJS)\sashtest.pdb del $(OBJS)\sashtest.pdb + +$(OBJS)\sashtest.exe: $(SASHTEST_OBJECTS) $(OBJS)\sashtest_sashtest.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\sashtest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(SASHTEST_OBJECTS) $(SASHTEST_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\sashtest_sashtest.obj: .\sashtest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(SASHTEST_CXXFLAGS) .\sashtest.cpp + +$(OBJS)\sashtest_sashtest.res: .\sashtest.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\sashtest.rc + diff --git a/samples/sashtest/makefile.wat b/samples/sashtest/makefile.wat index 25a6bb349a..b7e96a49e0 100644 --- a/samples/sashtest/makefile.wat +++ b/samples/sashtest/makefile.wat @@ -1,265 +1,265 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_ADV_p = -!ifeq MONOLITHIC 0 -__WXLIB_ADV_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SASHTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -SASHTEST_OBJECTS = & - $(OBJS)\sashtest_sashtest.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\sashtest.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\sashtest.exe del $(OBJS)\sashtest.exe - -$(OBJS)\sashtest.exe : $(SASHTEST_OBJECTS) $(OBJS)\sashtest_sashtest.res - @%create $(OBJS)\sashtest.lbc - @%append $(OBJS)\sashtest.lbc option quiet - @%append $(OBJS)\sashtest.lbc name $^@ - @%append $(OBJS)\sashtest.lbc option caseexact - @%append $(OBJS)\sashtest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(SASHTEST_OBJECTS)) do @%append $(OBJS)\sashtest.lbc file %i - @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\sashtest.lbc library %i - @%append $(OBJS)\sashtest.lbc option resource=$(OBJS)\sashtest_sashtest.res - @for %i in () do @%append $(OBJS)\sashtest.lbc option stack=%i - wlink @$(OBJS)\sashtest.lbc - -$(OBJS)\sashtest_sashtest.obj : .AUTODEPEND .\sashtest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(SASHTEST_CXXFLAGS) $< - -$(OBJS)\sashtest_sashtest.res : .AUTODEPEND .\sashtest.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +SASHTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +SASHTEST_OBJECTS = & + $(OBJS)\sashtest_sashtest.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\sashtest.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\sashtest.exe del $(OBJS)\sashtest.exe + +$(OBJS)\sashtest.exe : $(SASHTEST_OBJECTS) $(OBJS)\sashtest_sashtest.res + @%create $(OBJS)\sashtest.lbc + @%append $(OBJS)\sashtest.lbc option quiet + @%append $(OBJS)\sashtest.lbc name $^@ + @%append $(OBJS)\sashtest.lbc option caseexact + @%append $(OBJS)\sashtest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(SASHTEST_OBJECTS)) do @%append $(OBJS)\sashtest.lbc file %i + @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\sashtest.lbc library %i + @%append $(OBJS)\sashtest.lbc option resource=$(OBJS)\sashtest_sashtest.res + @for %i in () do @%append $(OBJS)\sashtest.lbc option stack=%i + wlink @$(OBJS)\sashtest.lbc + +$(OBJS)\sashtest_sashtest.obj : .AUTODEPEND .\sashtest.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(SASHTEST_CXXFLAGS) $< + +$(OBJS)\sashtest_sashtest.res : .AUTODEPEND .\sashtest.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/sashtest/sashtest.dsp b/samples/sashtest/sashtest.dsp index ab49a00d52..b165fc0f21 100644 --- a/samples/sashtest/sashtest.dsp +++ b/samples/sashtest/sashtest.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\sashtest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\sashtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\sashtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\sashtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\sashtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\sashtest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\sashtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\sashtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\sashtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\sashtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\sashtest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\sashtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\sashtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\sashtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\sashtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\sashtest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\sashtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\sashtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\sashtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\sashtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/sashtest/sashtest_vc7.vcproj b/samples/sashtest/sashtest_vc7.vcproj index a53ca8373e..41dda92028 100644 --- a/samples/sashtest/sashtest_vc7.vcproj +++ b/samples/sashtest/sashtest_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\sashtest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\sashtest.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\sashtest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\sashtest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\sashtest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\sashtest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\sashtest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\sashtest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\sashtest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\sashtest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\sashtest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\sashtest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SCROLL_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\scroll.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -SCROLL_OBJECTS = \ - $(OBJS)\scroll_scroll.obj \ - $(OBJS)\scroll_scroll.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\scroll.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\scroll.exe del $(OBJS)\scroll.exe - -if exist $(OBJS)\scroll.ilk del $(OBJS)\scroll.ilk - -if exist $(OBJS)\scroll.pdb del $(OBJS)\scroll.pdb - -$(OBJS)\scroll.exe: $(SCROLL_OBJECTS) $(OBJS)\scroll_scroll.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\scroll.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(SCROLL_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\scroll_scroll.obj: .\scroll.cpp - $(CXX) /c /nologo /TP /Fo$@ $(SCROLL_CXXFLAGS) .\scroll.cpp - -$(OBJS)\scroll_scroll.res: .\scroll.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\scroll.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +SCROLL_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\scroll.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +SCROLL_OBJECTS = \ + $(OBJS)\scroll_scroll.obj +SCROLL_RESOURCES = \ + $(OBJS)\scroll_scroll.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\scroll.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\scroll.exe del $(OBJS)\scroll.exe + -if exist $(OBJS)\scroll.ilk del $(OBJS)\scroll.ilk + -if exist $(OBJS)\scroll.pdb del $(OBJS)\scroll.pdb + +$(OBJS)\scroll.exe: $(SCROLL_OBJECTS) $(OBJS)\scroll_scroll.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\scroll.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(SCROLL_OBJECTS) $(SCROLL_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\scroll_scroll.obj: .\scroll.cpp + $(CXX) /c /nologo /TP /Fo$@ $(SCROLL_CXXFLAGS) .\scroll.cpp + +$(OBJS)\scroll_scroll.res: .\scroll.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\scroll.rc + diff --git a/samples/scroll/makefile.wat b/samples/scroll/makefile.wat index 8c4fdf264a..586eccc0e5 100644 --- a/samples/scroll/makefile.wat +++ b/samples/scroll/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SCROLL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -SCROLL_OBJECTS = & - $(OBJS)\scroll_scroll.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\scroll.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\scroll.exe del $(OBJS)\scroll.exe - -$(OBJS)\scroll.exe : $(SCROLL_OBJECTS) $(OBJS)\scroll_scroll.res - @%create $(OBJS)\scroll.lbc - @%append $(OBJS)\scroll.lbc option quiet - @%append $(OBJS)\scroll.lbc name $^@ - @%append $(OBJS)\scroll.lbc option caseexact - @%append $(OBJS)\scroll.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(SCROLL_OBJECTS)) do @%append $(OBJS)\scroll.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\scroll.lbc library %i - @%append $(OBJS)\scroll.lbc option resource=$(OBJS)\scroll_scroll.res - @for %i in () do @%append $(OBJS)\scroll.lbc option stack=%i - wlink @$(OBJS)\scroll.lbc - -$(OBJS)\scroll_scroll.obj : .AUTODEPEND .\scroll.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(SCROLL_CXXFLAGS) $< - -$(OBJS)\scroll_scroll.res : .AUTODEPEND .\scroll.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +SCROLL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +SCROLL_OBJECTS = & + $(OBJS)\scroll_scroll.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\scroll.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\scroll.exe del $(OBJS)\scroll.exe + +$(OBJS)\scroll.exe : $(SCROLL_OBJECTS) $(OBJS)\scroll_scroll.res + @%create $(OBJS)\scroll.lbc + @%append $(OBJS)\scroll.lbc option quiet + @%append $(OBJS)\scroll.lbc name $^@ + @%append $(OBJS)\scroll.lbc option caseexact + @%append $(OBJS)\scroll.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(SCROLL_OBJECTS)) do @%append $(OBJS)\scroll.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\scroll.lbc library %i + @%append $(OBJS)\scroll.lbc option resource=$(OBJS)\scroll_scroll.res + @for %i in () do @%append $(OBJS)\scroll.lbc option stack=%i + wlink @$(OBJS)\scroll.lbc + +$(OBJS)\scroll_scroll.obj : .AUTODEPEND .\scroll.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(SCROLL_CXXFLAGS) $< + +$(OBJS)\scroll_scroll.res : .AUTODEPEND .\scroll.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/scroll/scroll.dsp b/samples/scroll/scroll.dsp index 26be16baf4..3b0d09b90d 100644 --- a/samples/scroll/scroll.dsp +++ b/samples/scroll/scroll.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\scroll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\scroll.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\scroll.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\scroll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\scroll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\scroll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\scroll.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\scroll.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\scroll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\scroll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\scroll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\scroll.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\scroll.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\scroll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\scroll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\scroll" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\scroll.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\scroll.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\scroll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\scroll.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/scroll/scroll_vc7.vcproj b/samples/scroll/scroll_vc7.vcproj index 0127439e30..464ea46dab 100644 --- a/samples/scroll/scroll_vc7.vcproj +++ b/samples/scroll/scroll_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\scroll.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\scroll.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\scroll.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\scroll.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\scroll.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\scroll.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\scroll.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\scroll.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\scroll.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\scroll.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\scroll.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\scroll.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SHAPED_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\shaped.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -SHAPED_OBJECTS = \ - $(OBJS)\shaped_shaped.obj \ - $(OBJS)\shaped_shaped.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\shaped.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\shaped.exe del $(OBJS)\shaped.exe - -if exist $(OBJS)\shaped.ilk del $(OBJS)\shaped.ilk - -if exist $(OBJS)\shaped.pdb del $(OBJS)\shaped.pdb - -$(OBJS)\shaped.exe: $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\shaped.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(SHAPED_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (star.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\shaped_shaped.obj: .\shaped.cpp - $(CXX) /c /nologo /TP /Fo$@ $(SHAPED_CXXFLAGS) .\shaped.cpp - -$(OBJS)\shaped_shaped.res: .\shaped.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\shaped.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +SHAPED_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\shaped.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +SHAPED_OBJECTS = \ + $(OBJS)\shaped_shaped.obj +SHAPED_RESOURCES = \ + $(OBJS)\shaped_shaped.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\shaped.exe data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\shaped.exe del $(OBJS)\shaped.exe + -if exist $(OBJS)\shaped.ilk del $(OBJS)\shaped.ilk + -if exist $(OBJS)\shaped.pdb del $(OBJS)\shaped.pdb + +$(OBJS)\shaped.exe: $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\shaped.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(SHAPED_OBJECTS) $(SHAPED_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (star.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\shaped_shaped.obj: .\shaped.cpp + $(CXX) /c /nologo /TP /Fo$@ $(SHAPED_CXXFLAGS) .\shaped.cpp + +$(OBJS)\shaped_shaped.res: .\shaped.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\shaped.rc + diff --git a/samples/shaped/makefile.wat b/samples/shaped/makefile.wat index 29a3221255..caacdc9927 100644 --- a/samples/shaped/makefile.wat +++ b/samples/shaped/makefile.wat @@ -1,264 +1,264 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SHAPED_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -SHAPED_OBJECTS = & - $(OBJS)\shaped_shaped.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\shaped.exe data - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\shaped.exe del $(OBJS)\shaped.exe - -$(OBJS)\shaped.exe : $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped.res - @%create $(OBJS)\shaped.lbc - @%append $(OBJS)\shaped.lbc option quiet - @%append $(OBJS)\shaped.lbc name $^@ - @%append $(OBJS)\shaped.lbc option caseexact - @%append $(OBJS)\shaped.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(SHAPED_OBJECTS)) do @%append $(OBJS)\shaped.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\shaped.lbc library %i - @%append $(OBJS)\shaped.lbc option resource=$(OBJS)\shaped_shaped.res - @for %i in () do @%append $(OBJS)\shaped.lbc option stack=%i - wlink @$(OBJS)\shaped.lbc - -data : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (star.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\shaped_shaped.obj : .AUTODEPEND .\shaped.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(SHAPED_CXXFLAGS) $< - -$(OBJS)\shaped_shaped.res : .AUTODEPEND .\shaped.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +SHAPED_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +SHAPED_OBJECTS = & + $(OBJS)\shaped_shaped.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\shaped.exe data + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\shaped.exe del $(OBJS)\shaped.exe + +$(OBJS)\shaped.exe : $(SHAPED_OBJECTS) $(OBJS)\shaped_shaped.res + @%create $(OBJS)\shaped.lbc + @%append $(OBJS)\shaped.lbc option quiet + @%append $(OBJS)\shaped.lbc name $^@ + @%append $(OBJS)\shaped.lbc option caseexact + @%append $(OBJS)\shaped.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(SHAPED_OBJECTS)) do @%append $(OBJS)\shaped.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\shaped.lbc library %i + @%append $(OBJS)\shaped.lbc option resource=$(OBJS)\shaped_shaped.res + @for %i in () do @%append $(OBJS)\shaped.lbc option stack=%i + wlink @$(OBJS)\shaped.lbc + +data : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (star.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\shaped_shaped.obj : .AUTODEPEND .\shaped.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(SHAPED_CXXFLAGS) $< + +$(OBJS)\shaped_shaped.res : .AUTODEPEND .\shaped.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/shaped/shaped.dsp b/samples/shaped/shaped.dsp index 778f45343a..317fbc9b87 100644 --- a/samples/shaped/shaped.dsp +++ b/samples/shaped/shaped.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\shaped" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\shaped.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\shaped.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\shaped.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\shaped.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\shaped" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\shaped.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\shaped.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\shaped.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\shaped.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\shaped" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\shaped.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\shaped.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\shaped.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\shaped.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\shaped" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\shaped.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\shaped.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\shaped.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\shaped.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/shaped/shaped_vc7.vcproj b/samples/shaped/shaped_vc7.vcproj index 86e7c47fbc..d80f4f9c50 100644 --- a/samples/shaped/shaped_vc7.vcproj +++ b/samples/shaped/shaped_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\shaped.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\shaped.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\shaped.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\shaped.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\shaped.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\shaped.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\shaped.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\shaped.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\shaped.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\shaped.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\shaped.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\shaped.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -CLIENT_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) /Fd$(OBJS)\client.pdb $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \ - /I.\..\..\samples /DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \ - $(CXXFLAGS) -CLIENT_OBJECTS = \ - $(OBJS)\client_client.obj \ - $(OBJS)\client_client.res -SERVER_CXXFLAGS = /M$(__RUNTIME_LIBS_22)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) /Fd$(OBJS)\server.pdb $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ - $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ - /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \ - /I.\..\..\samples /DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \ - $(CXXFLAGS) -SERVER_OBJECTS = \ - $(OBJS)\server_server.obj \ - $(OBJS)\server_server.res -BASECLIENT_CXXFLAGS = /M$(__RUNTIME_LIBS_36)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) /Fd$(OBJS)\baseclient.pdb $(____DEBUGRUNTIME) \ - $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \ - $(CXXFLAGS) -BASECLIENT_OBJECTS = \ - $(OBJS)\baseclient_baseclient.obj -BASESERVER_CXXFLAGS = /M$(__RUNTIME_LIBS_50)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) /Fd$(OBJS)\baseserver.pdb $(____DEBUGRUNTIME) \ - $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) \ - $(CXXFLAGS) -BASESERVER_OBJECTS = \ - $(OBJS)\baseserver_baseserver.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(USE_GUI)" == "1" -__client___depname = $(OBJS)\client.exe -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG) -!endif -!if "$(USE_GUI)" == "1" -__server___depname = $(OBJS)\server.exe -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_22 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_22 = $(__THREADSFLAG) -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_36 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_36 = $(__THREADSFLAG) -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_50 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_50 = $(__THREADSFLAG) -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_0 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_0 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_0 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_0 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_0 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_0 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_0 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_0 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_0 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_0 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_0 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_0 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_0 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_0 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_0 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_0 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_3 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_3 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_3 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_3 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG = T -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_NET_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(__client___depname) $(__server___depname) $(OBJS)\baseclient.exe $(OBJS)\baseserver.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\client.exe del $(OBJS)\client.exe - -if exist $(OBJS)\client.ilk del $(OBJS)\client.ilk - -if exist $(OBJS)\client.pdb del $(OBJS)\client.pdb - -if exist $(OBJS)\server.exe del $(OBJS)\server.exe - -if exist $(OBJS)\server.ilk del $(OBJS)\server.ilk - -if exist $(OBJS)\server.pdb del $(OBJS)\server.pdb - -if exist $(OBJS)\baseclient.exe del $(OBJS)\baseclient.exe - -if exist $(OBJS)\baseclient.ilk del $(OBJS)\baseclient.ilk - -if exist $(OBJS)\baseclient.pdb del $(OBJS)\baseclient.pdb - -if exist $(OBJS)\baseserver.exe del $(OBJS)\baseserver.exe - -if exist $(OBJS)\baseserver.ilk del $(OBJS)\baseserver.ilk - -if exist $(OBJS)\baseserver.pdb del $(OBJS)\baseserver.pdb - -!if "$(USE_GUI)" == "1" -$(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_client.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_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 wininet.lib -<< -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_server.res - 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 wininet.lib -<< -!endif - -$(OBJS)\baseclient.exe: $(BASECLIENT_OBJECTS) - 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 wininet.lib -<< - -$(OBJS)\baseserver.exe: $(BASESERVER_OBJECTS) - 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 wininet.lib -<< - -$(OBJS)\client_client.obj: .\client.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CLIENT_CXXFLAGS) .\client.cpp - -$(OBJS)\client_client.res: .\client.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_0) $(__NO_VC_CRTDBG_p_0) /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_0) /d _WINDOWS /i .\..\..\samples /d NOPCH .\client.rc - -$(OBJS)\server_server.obj: .\server.cpp - $(CXX) /c /nologo /TP /Fo$@ $(SERVER_CXXFLAGS) .\server.cpp - -$(OBJS)\server_server.res: .\server.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_0) $(__NO_VC_CRTDBG_p_0) /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_0) /d _WINDOWS /i .\..\..\samples /d NOPCH .\server.rc - -$(OBJS)\baseclient_baseclient.obj: .\baseclient.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASECLIENT_CXXFLAGS) .\baseclient.cpp - -$(OBJS)\baseserver_baseserver.obj: .\baseserver.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASESERVER_CXXFLAGS) .\baseserver.cpp - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +CLIENT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 \ + $(__DEBUGINFO) /Fd$(OBJS)\client.pdb $(__DEBUGINFO_2) $(____DEBUGRUNTIME) \ + $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + $(CPPFLAGS) $(CXXFLAGS) +CLIENT_OBJECTS = \ + $(OBJS)\client_client.obj +CLIENT_RESOURCES = \ + $(OBJS)\client_client.res +SERVER_CXXFLAGS = /M$(__RUNTIME_LIBS_26)$(__DEBUGRUNTIME) /DWIN32 \ + $(__DEBUGINFO) /Fd$(OBJS)\server.pdb $(__DEBUGINFO_18) $(____DEBUGRUNTIME) \ + $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ + /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + $(CPPFLAGS) $(CXXFLAGS) +SERVER_OBJECTS = \ + $(OBJS)\server_server.obj +SERVER_RESOURCES = \ + $(OBJS)\server_server.res +BASECLIENT_CXXFLAGS = /M$(__RUNTIME_LIBS_42)$(__DEBUGRUNTIME) /DWIN32 \ + $(__DEBUGINFO) /Fd$(OBJS)\baseclient.pdb $(__DEBUGINFO_34) \ + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + $(CPPFLAGS) $(CXXFLAGS) +BASECLIENT_OBJECTS = \ + $(OBJS)\baseclient_baseclient.obj +BASESERVER_CXXFLAGS = /M$(__RUNTIME_LIBS_58)$(__DEBUGRUNTIME) /DWIN32 \ + $(__DEBUGINFO) /Fd$(OBJS)\baseserver.pdb $(__DEBUGINFO_50) \ + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ + $(CPPFLAGS) $(CXXFLAGS) +BASESERVER_OBJECTS = \ + $(OBJS)\baseserver_baseserver.obj + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(USE_GUI)" == "1" +__client___depname = $(OBJS)\client.exe +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_2) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_2) +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG) +!endif +!if "$(USE_GUI)" == "1" +__server___depname = $(OBJS)\server.exe +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_18 = $(__DEBUGRUNTIME_2) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_18 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_18 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_18 = $(__DEBUGRUNTIME_2) +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_26 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_26 = $(__THREADSFLAG) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_34 = $(__DEBUGRUNTIME_2) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_34 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_34 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_34 = $(__DEBUGRUNTIME_2) +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_42 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_42 = $(__THREADSFLAG) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_50 = $(__DEBUGRUNTIME_2) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_50 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_50 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_50 = $(__DEBUGRUNTIME_2) +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_58 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_58 = $(__THREADSFLAG) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_0 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_0 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_0 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_0 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_0 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_0 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_0 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_0 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_0 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_0 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_0 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_0 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_0 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_0 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_0 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_0 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_4 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_4 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_4 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_4 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_2 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_2 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_2 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_2 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG = T +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_NET_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__client___depname) $(__server___depname) $(OBJS)\baseclient.exe $(OBJS)\baseserver.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\client.exe del $(OBJS)\client.exe + -if exist $(OBJS)\client.ilk del $(OBJS)\client.ilk + -if exist $(OBJS)\client.pdb del $(OBJS)\client.pdb + -if exist $(OBJS)\server.exe del $(OBJS)\server.exe + -if exist $(OBJS)\server.ilk del $(OBJS)\server.ilk + -if exist $(OBJS)\server.pdb del $(OBJS)\server.pdb + -if exist $(OBJS)\baseclient.exe del $(OBJS)\baseclient.exe + -if exist $(OBJS)\baseclient.ilk del $(OBJS)\baseclient.ilk + -if exist $(OBJS)\baseclient.pdb del $(OBJS)\baseclient.pdb + -if exist $(OBJS)\baseserver.exe del $(OBJS)\baseserver.exe + -if exist $(OBJS)\baseserver.ilk del $(OBJS)\baseserver.ilk + -if exist $(OBJS)\baseserver.pdb del $(OBJS)\baseserver.pdb + +!if "$(USE_GUI)" == "1" +$(OBJS)\client.exe: $(CLIENT_OBJECTS) $(OBJS)\client_client.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\client.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(CLIENT_OBJECTS) $(CLIENT_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\server.exe: $(SERVER_OBJECTS) $(OBJS)\server_server.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\server.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(SERVER_OBJECTS) $(SERVER_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< +!endif + +$(OBJS)\baseclient.exe: $(BASECLIENT_OBJECTS) + link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\baseclient.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< + $(BASECLIENT_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\baseserver.exe: $(BASESERVER_OBJECTS) + link /NOLOGO /OUT:$@ $(__DEBUGINFO_4) /pdb:"$(OBJS)\baseserver.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< + $(BASESERVER_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\client_client.obj: .\client.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CLIENT_CXXFLAGS) .\client.cpp + +$(OBJS)\client_client.res: .\client.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_0) $(__NO_VC_CRTDBG_p_0) /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_0) /d _WINDOWS /i .\..\..\samples /d NOPCH .\client.rc + +$(OBJS)\server_server.obj: .\server.cpp + $(CXX) /c /nologo /TP /Fo$@ $(SERVER_CXXFLAGS) .\server.cpp + +$(OBJS)\server_server.res: .\server.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_0) $(__NO_VC_CRTDBG_p_0) /d __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) $(__MSLU_DEFINE_p_0) $(__GFXCTX_DEFINE_p_0) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_0) /d _WINDOWS /i .\..\..\samples /d NOPCH .\server.rc + +$(OBJS)\baseclient_baseclient.obj: .\baseclient.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BASECLIENT_CXXFLAGS) .\baseclient.cpp + +$(OBJS)\baseserver_baseserver.obj: .\baseserver.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BASESERVER_CXXFLAGS) .\baseserver.cpp + diff --git a/samples/sockets/makefile.wat b/samples/sockets/makefile.wat index a7c2d23537..643809958a 100644 --- a/samples/sockets/makefile.wat +++ b/samples/sockets/makefile.wat @@ -1,353 +1,353 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__client___depname = -!ifeq USE_GUI 1 -__client___depname = $(OBJS)\client.exe -!endif -__server___depname = -!ifeq USE_GUI 1 -__server___depname = $(OBJS)\server.exe -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__DEBUGINFO = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO = -d2 -!endif -__DEBUGINFO_3 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_3 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_3 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_3 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_3 = debug all -!endif -__OPTIMIZEFLAG = -!ifeq BUILD debug -__OPTIMIZEFLAG = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG = -ot -ox -!endif -__THREADSFLAG = -!ifeq USE_THREADS 0 -__THREADSFLAG = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG = -bm -!endif -__RUNTIME_LIBS = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS = -!endif -__RTTIFLAG = -!ifeq USE_RTTI 0 -__RTTIFLAG = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG = -xr -!endif -__EXCEPTIONSFLAG = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG = -xs -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif -__WXLIB_NET_p = -!ifeq MONOLITHIC 0 -__WXLIB_NET_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -CLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & - $(CXXFLAGS) -CLIENT_OBJECTS = & - $(OBJS)\client_client.obj -SERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & - $(CXXFLAGS) -SERVER_OBJECTS = & - $(OBJS)\server_server.obj -BASECLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -dwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -BASECLIENT_OBJECTS = & - $(OBJS)\baseclient_baseclient.obj -BASESERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -dwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -BASESERVER_OBJECTS = & - $(OBJS)\baseserver_baseserver.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(__client___depname) $(__server___depname) $(OBJS)\baseclient.exe $(OBJS)\baseserver.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\client.exe del $(OBJS)\client.exe - -if exist $(OBJS)\server.exe del $(OBJS)\server.exe - -if exist $(OBJS)\baseclient.exe del $(OBJS)\baseclient.exe - -if exist $(OBJS)\baseserver.exe del $(OBJS)\baseserver.exe - -!ifeq USE_GUI 1 -$(OBJS)\client.exe : $(CLIENT_OBJECTS) $(OBJS)\client_client.res - @%create $(OBJS)\client.lbc - @%append $(OBJS)\client.lbc option quiet - @%append $(OBJS)\client.lbc name $^@ - @%append $(OBJS)\client.lbc option caseexact - @%append $(OBJS)\client.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(CLIENT_OBJECTS)) do @%append $(OBJS)\client.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\client.lbc library %i - @%append $(OBJS)\client.lbc option resource=$(OBJS)\client_client.res - @for %i in () do @%append $(OBJS)\client.lbc option stack=%i - wlink @$(OBJS)\client.lbc -!endif - -!ifeq USE_GUI 1 -$(OBJS)\server.exe : $(SERVER_OBJECTS) $(OBJS)\server_server.res - @%create $(OBJS)\server.lbc - @%append $(OBJS)\server.lbc option quiet - @%append $(OBJS)\server.lbc name $^@ - @%append $(OBJS)\server.lbc option caseexact - @%append $(OBJS)\server.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(SERVER_OBJECTS)) do @%append $(OBJS)\server.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\server.lbc library %i - @%append $(OBJS)\server.lbc option resource=$(OBJS)\server_server.res - @for %i in () do @%append $(OBJS)\server.lbc option stack=%i - wlink @$(OBJS)\server.lbc -!endif - -$(OBJS)\baseclient.exe : $(BASECLIENT_OBJECTS) - @%create $(OBJS)\baseclient.lbc - @%append $(OBJS)\baseclient.lbc option quiet - @%append $(OBJS)\baseclient.lbc name $^@ - @%append $(OBJS)\baseclient.lbc option caseexact - @%append $(OBJS)\baseclient.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) - @for %i in ($(BASECLIENT_OBJECTS)) do @%append $(OBJS)\baseclient.lbc file %i - @for %i in ( $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\baseclient.lbc library %i - @%append $(OBJS)\baseclient.lbc - @for %i in () do @%append $(OBJS)\baseclient.lbc option stack=%i - wlink @$(OBJS)\baseclient.lbc - -$(OBJS)\baseserver.exe : $(BASESERVER_OBJECTS) - @%create $(OBJS)\baseserver.lbc - @%append $(OBJS)\baseserver.lbc option quiet - @%append $(OBJS)\baseserver.lbc name $^@ - @%append $(OBJS)\baseserver.lbc option caseexact - @%append $(OBJS)\baseserver.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) - @for %i in ($(BASESERVER_OBJECTS)) do @%append $(OBJS)\baseserver.lbc file %i - @for %i in ( $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\baseserver.lbc library %i - @%append $(OBJS)\baseserver.lbc - @for %i in () do @%append $(OBJS)\baseserver.lbc option stack=%i - wlink @$(OBJS)\baseserver.lbc - -$(OBJS)\client_client.obj : .AUTODEPEND .\client.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CLIENT_CXXFLAGS) $< - -$(OBJS)\client_client.res : .AUTODEPEND .\client.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - -$(OBJS)\server_server.obj : .AUTODEPEND .\server.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(SERVER_CXXFLAGS) $< - -$(OBJS)\server_server.res : .AUTODEPEND .\server.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - -$(OBJS)\baseclient_baseclient.obj : .AUTODEPEND .\baseclient.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASECLIENT_CXXFLAGS) $< - -$(OBJS)\baseserver_baseserver.obj : .AUTODEPEND .\baseserver.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASESERVER_CXXFLAGS) $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__client___depname = +!ifeq USE_GUI 1 +__client___depname = $(OBJS)\client.exe +!endif +__server___depname = +!ifeq USE_GUI 1 +__server___depname = $(OBJS)\server.exe +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__DEBUGINFO = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO = -d2 +!endif +__DEBUGINFO_3 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_3 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_3 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_3 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_3 = debug all +!endif +__OPTIMIZEFLAG = +!ifeq BUILD debug +__OPTIMIZEFLAG = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG = -ot -ox +!endif +__THREADSFLAG = +!ifeq USE_THREADS 0 +__THREADSFLAG = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG = -bm +!endif +__RUNTIME_LIBS = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS = +!endif +__RTTIFLAG = +!ifeq USE_RTTI 0 +__RTTIFLAG = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG = -xr +!endif +__EXCEPTIONSFLAG = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG = -xs +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__WXLIB_NET_p = +!ifeq MONOLITHIC 0 +__WXLIB_NET_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +CLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & + $(CXXFLAGS) +CLIENT_OBJECTS = & + $(OBJS)\client_client.obj +SERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & + $(CXXFLAGS) +SERVER_OBJECTS = & + $(OBJS)\server_server.obj +BASECLIENT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -dwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) +BASECLIENT_OBJECTS = & + $(OBJS)\baseclient_baseclient.obj +BASESERVER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & + $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -dwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) +BASESERVER_OBJECTS = & + $(OBJS)\baseserver_baseserver.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(__client___depname) $(__server___depname) $(OBJS)\baseclient.exe $(OBJS)\baseserver.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\client.exe del $(OBJS)\client.exe + -if exist $(OBJS)\server.exe del $(OBJS)\server.exe + -if exist $(OBJS)\baseclient.exe del $(OBJS)\baseclient.exe + -if exist $(OBJS)\baseserver.exe del $(OBJS)\baseserver.exe + +!ifeq USE_GUI 1 +$(OBJS)\client.exe : $(CLIENT_OBJECTS) $(OBJS)\client_client.res + @%create $(OBJS)\client.lbc + @%append $(OBJS)\client.lbc option quiet + @%append $(OBJS)\client.lbc name $^@ + @%append $(OBJS)\client.lbc option caseexact + @%append $(OBJS)\client.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(CLIENT_OBJECTS)) do @%append $(OBJS)\client.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\client.lbc library %i + @%append $(OBJS)\client.lbc option resource=$(OBJS)\client_client.res + @for %i in () do @%append $(OBJS)\client.lbc option stack=%i + wlink @$(OBJS)\client.lbc +!endif + +!ifeq USE_GUI 1 +$(OBJS)\server.exe : $(SERVER_OBJECTS) $(OBJS)\server_server.res + @%create $(OBJS)\server.lbc + @%append $(OBJS)\server.lbc option quiet + @%append $(OBJS)\server.lbc name $^@ + @%append $(OBJS)\server.lbc option caseexact + @%append $(OBJS)\server.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(SERVER_OBJECTS)) do @%append $(OBJS)\server.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\server.lbc library %i + @%append $(OBJS)\server.lbc option resource=$(OBJS)\server_server.res + @for %i in () do @%append $(OBJS)\server.lbc option stack=%i + wlink @$(OBJS)\server.lbc +!endif + +$(OBJS)\baseclient.exe : $(BASECLIENT_OBJECTS) + @%create $(OBJS)\baseclient.lbc + @%append $(OBJS)\baseclient.lbc option quiet + @%append $(OBJS)\baseclient.lbc name $^@ + @%append $(OBJS)\baseclient.lbc option caseexact + @%append $(OBJS)\baseclient.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) + @for %i in ($(BASECLIENT_OBJECTS)) do @%append $(OBJS)\baseclient.lbc file %i + @for %i in ( $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\baseclient.lbc library %i + @%append $(OBJS)\baseclient.lbc + @for %i in () do @%append $(OBJS)\baseclient.lbc option stack=%i + wlink @$(OBJS)\baseclient.lbc + +$(OBJS)\baseserver.exe : $(BASESERVER_OBJECTS) + @%create $(OBJS)\baseserver.lbc + @%append $(OBJS)\baseserver.lbc option quiet + @%append $(OBJS)\baseserver.lbc name $^@ + @%append $(OBJS)\baseserver.lbc option caseexact + @%append $(OBJS)\baseserver.lbc $(__DEBUGINFO_3) libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) + @for %i in ($(BASESERVER_OBJECTS)) do @%append $(OBJS)\baseserver.lbc file %i + @for %i in ( $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\baseserver.lbc library %i + @%append $(OBJS)\baseserver.lbc + @for %i in () do @%append $(OBJS)\baseserver.lbc option stack=%i + wlink @$(OBJS)\baseserver.lbc + +$(OBJS)\client_client.obj : .AUTODEPEND .\client.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CLIENT_CXXFLAGS) $< + +$(OBJS)\client_client.res : .AUTODEPEND .\client.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + +$(OBJS)\server_server.obj : .AUTODEPEND .\server.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(SERVER_CXXFLAGS) $< + +$(OBJS)\server_server.res : .AUTODEPEND .\server.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + +$(OBJS)\baseclient_baseclient.obj : .AUTODEPEND .\baseclient.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASECLIENT_CXXFLAGS) $< + +$(OBJS)\baseserver_baseserver.obj : .AUTODEPEND .\baseserver.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BASESERVER_CXXFLAGS) $< + diff --git a/samples/sockets/sockets_baseclient.dsp b/samples/sockets/sockets_baseclient.dsp index e9dc2eba43..8e9b81d193 100644 --- a/samples/sockets/sockets_baseclient.dsp +++ b/samples/sockets/sockets_baseclient.dsp @@ -46,8 +46,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\baseclient" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe @@ -92,8 +92,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\baseclient" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe @@ -138,8 +138,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\baseclient" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe @@ -184,8 +184,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\baseclient" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseclient.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseclient.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe diff --git a/samples/sockets/sockets_baseserver.dsp b/samples/sockets/sockets_baseserver.dsp index 5964000d5c..a8c00b7da8 100644 --- a/samples/sockets/sockets_baseserver.dsp +++ b/samples/sockets/sockets_baseserver.dsp @@ -46,8 +46,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\baseserver" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\baseserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe @@ -92,8 +92,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\baseserver" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\baseserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe @@ -138,8 +138,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\baseserver" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\baseserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe @@ -184,8 +184,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\baseserver" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseserver.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\baseserver.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe diff --git a/samples/sockets/sockets_client.dsp b/samples/sockets/sockets_client.dsp index ad12de0739..213404365d 100644 --- a/samples/sockets/sockets_client.dsp +++ b/samples/sockets/sockets_client.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\client" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\client.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\client.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\client.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\client.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\client" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\client.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\client.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\client.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\client.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\client" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\client.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\client.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\client.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\client.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\client" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\client.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\client.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\client.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\client.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/sockets/sockets_server.dsp b/samples/sockets/sockets_server.dsp index e8d7769358..9d15c5d9ea 100644 --- a/samples/sockets/sockets_server.dsp +++ b/samples/sockets/sockets_server.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\server" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\server.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\server.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\server.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\server.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\server" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\server.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\server.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\server.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\server.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\server" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\server.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\server.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\server.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\server.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\server" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\server.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\server.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\server.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\server.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/sockets/sockets_vc7_baseclient.vcproj b/samples/sockets/sockets_vc7_baseclient.vcproj index f87f113113..ee6032cde7 100644 --- a/samples/sockets/sockets_vc7_baseclient.vcproj +++ b/samples/sockets/sockets_vc7_baseclient.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\baseclient.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\baseclient.pdb" SubSystem="1" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\baseserver.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\baseserver.pdb" SubSystem="1" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\client.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\client.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\server.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\server.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\baseclient.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\baseclient.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\baseserver.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\baseserver.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\client.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\client.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\server.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\server.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\baseclient.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\baseclient.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\baseclient.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\baseclient.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\baseclient.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\baseclient.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\baseclient.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\baseclient.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\baseserver.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\baseserver.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\baseserver.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\baseserver.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\baseserver.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\baseserver.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\baseserver.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\baseserver.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\client.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\client.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\client.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\client.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\client.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\client.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\client.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\client.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\server.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\server.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\server.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\server.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\server.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\server.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\server.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\server.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SOUND_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\sound.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -SOUND_OBJECTS = \ - $(OBJS)\sound_sound.obj \ - $(OBJS)\sound_sound.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_ADV_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\sound.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\sound.exe del $(OBJS)\sound.exe - -if exist $(OBJS)\sound.ilk del $(OBJS)\sound.ilk - -if exist $(OBJS)\sound.pdb del $(OBJS)\sound.pdb - -$(OBJS)\sound.exe: $(SOUND_OBJECTS) $(OBJS)\sound_sound.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\sound.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(SOUND_OBJECTS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (9000g.wav cuckoo.wav doggrowl.wav tinkalink2.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\sound_sound.obj: .\sound.cpp - $(CXX) /c /nologo /TP /Fo$@ $(SOUND_CXXFLAGS) .\sound.cpp - -$(OBJS)\sound_sound.res: .\sound.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\sound.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +SOUND_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\sound.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +SOUND_OBJECTS = \ + $(OBJS)\sound_sound.obj +SOUND_RESOURCES = \ + $(OBJS)\sound_sound.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_ADV_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\sound.exe data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\sound.exe del $(OBJS)\sound.exe + -if exist $(OBJS)\sound.ilk del $(OBJS)\sound.ilk + -if exist $(OBJS)\sound.pdb del $(OBJS)\sound.pdb + +$(OBJS)\sound.exe: $(SOUND_OBJECTS) $(OBJS)\sound_sound.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\sound.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(SOUND_OBJECTS) $(SOUND_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (9000g.wav cuckoo.wav doggrowl.wav tinkalink2.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\sound_sound.obj: .\sound.cpp + $(CXX) /c /nologo /TP /Fo$@ $(SOUND_CXXFLAGS) .\sound.cpp + +$(OBJS)\sound_sound.res: .\sound.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\sound.rc + diff --git a/samples/sound/makefile.wat b/samples/sound/makefile.wat index fbb392f26b..07aab13e77 100644 --- a/samples/sound/makefile.wat +++ b/samples/sound/makefile.wat @@ -1,269 +1,269 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_ADV_p = -!ifeq MONOLITHIC 0 -__WXLIB_ADV_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SOUND_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -SOUND_OBJECTS = & - $(OBJS)\sound_sound.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\sound.exe data - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\sound.exe del $(OBJS)\sound.exe - -$(OBJS)\sound.exe : $(SOUND_OBJECTS) $(OBJS)\sound_sound.res - @%create $(OBJS)\sound.lbc - @%append $(OBJS)\sound.lbc option quiet - @%append $(OBJS)\sound.lbc name $^@ - @%append $(OBJS)\sound.lbc option caseexact - @%append $(OBJS)\sound.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(SOUND_OBJECTS)) do @%append $(OBJS)\sound.lbc file %i - @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\sound.lbc library %i - @%append $(OBJS)\sound.lbc option resource=$(OBJS)\sound_sound.res - @for %i in () do @%append $(OBJS)\sound.lbc option stack=%i - wlink @$(OBJS)\sound.lbc - -data : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (9000g.wav cuckoo.wav doggrowl.wav tinkalink2.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\sound_sound.obj : .AUTODEPEND .\sound.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(SOUND_CXXFLAGS) $< - -$(OBJS)\sound_sound.res : .AUTODEPEND .\sound.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +SOUND_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +SOUND_OBJECTS = & + $(OBJS)\sound_sound.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\sound.exe data + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\sound.exe del $(OBJS)\sound.exe + +$(OBJS)\sound.exe : $(SOUND_OBJECTS) $(OBJS)\sound_sound.res + @%create $(OBJS)\sound.lbc + @%append $(OBJS)\sound.lbc option quiet + @%append $(OBJS)\sound.lbc name $^@ + @%append $(OBJS)\sound.lbc option caseexact + @%append $(OBJS)\sound.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(SOUND_OBJECTS)) do @%append $(OBJS)\sound.lbc file %i + @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\sound.lbc library %i + @%append $(OBJS)\sound.lbc option resource=$(OBJS)\sound_sound.res + @for %i in () do @%append $(OBJS)\sound.lbc option stack=%i + wlink @$(OBJS)\sound.lbc + +data : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (9000g.wav cuckoo.wav doggrowl.wav tinkalink2.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\sound_sound.obj : .AUTODEPEND .\sound.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(SOUND_CXXFLAGS) $< + +$(OBJS)\sound_sound.res : .AUTODEPEND .\sound.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/sound/sound.dsp b/samples/sound/sound.dsp index 171d07c2bd..bafdf1bdd5 100644 --- a/samples/sound/sound.dsp +++ b/samples/sound/sound.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\sound" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\sound.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\sound.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\sound.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\sound.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\sound" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\sound.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\sound.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\sound.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\sound.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\sound" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\sound.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\sound.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\sound.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\sound.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\sound" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\sound.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\sound.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\sound.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\sound.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/sound/sound_vc7.vcproj b/samples/sound/sound_vc7.vcproj index 5bc088a250..417fafb1ef 100644 --- a/samples/sound/sound_vc7.vcproj +++ b/samples/sound/sound_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\sound.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\sound.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\sound.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\sound.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\sound.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\sound.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\sound.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\sound.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\sound.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\sound.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\sound.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\sound.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SPLASH_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\splash.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -SPLASH_OBJECTS = \ - $(OBJS)\splash_splash.obj \ - $(OBJS)\splash_sample.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" && "$(USE_MEDIA)" == "1" -__WXLIB_MEDIA_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_ADV_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\splash.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\splash.exe del $(OBJS)\splash.exe - -if exist $(OBJS)\splash.ilk del $(OBJS)\splash.ilk - -if exist $(OBJS)\splash.pdb del $(OBJS)\splash.pdb - -$(OBJS)\splash.exe: $(SPLASH_OBJECTS) $(OBJS)\splash_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\splash.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(SPLASH_OBJECTS) $(__WXLIB_MEDIA_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (splash.png press.mpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\splash_splash.obj: .\splash.cpp - $(CXX) /c /nologo /TP /Fo$@ $(SPLASH_CXXFLAGS) .\splash.cpp - -$(OBJS)\splash_sample.res: .\..\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +SPLASH_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\splash.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +SPLASH_OBJECTS = \ + $(OBJS)\splash_splash.obj +SPLASH_RESOURCES = \ + $(OBJS)\splash_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" && "$(USE_MEDIA)" == "1" +__WXLIB_MEDIA_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_ADV_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\splash.exe data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\splash.exe del $(OBJS)\splash.exe + -if exist $(OBJS)\splash.ilk del $(OBJS)\splash.ilk + -if exist $(OBJS)\splash.pdb del $(OBJS)\splash.pdb + +$(OBJS)\splash.exe: $(SPLASH_OBJECTS) $(OBJS)\splash_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\splash.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(SPLASH_OBJECTS) $(SPLASH_RESOURCES) $(__WXLIB_MEDIA_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (splash.png press.mpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\splash_splash.obj: .\splash.cpp + $(CXX) /c /nologo /TP /Fo$@ $(SPLASH_CXXFLAGS) .\splash.cpp + +$(OBJS)\splash_sample.res: .\..\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc + diff --git a/samples/splash/makefile.wat b/samples/splash/makefile.wat index d2e2db0930..04d2f27c7a 100644 --- a/samples/splash/makefile.wat +++ b/samples/splash/makefile.wat @@ -1,276 +1,276 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_MEDIA_p = -!ifeq MONOLITHIC 0 -!ifeq USE_MEDIA 1 -__WXLIB_MEDIA_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib -!endif -!endif -__WXLIB_ADV_p = -!ifeq MONOLITHIC 0 -__WXLIB_ADV_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SPLASH_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -SPLASH_OBJECTS = & - $(OBJS)\splash_splash.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\splash.exe data - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\splash.exe del $(OBJS)\splash.exe - -$(OBJS)\splash.exe : $(SPLASH_OBJECTS) $(OBJS)\splash_sample.res - @%create $(OBJS)\splash.lbc - @%append $(OBJS)\splash.lbc option quiet - @%append $(OBJS)\splash.lbc name $^@ - @%append $(OBJS)\splash.lbc option caseexact - @%append $(OBJS)\splash.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(SPLASH_OBJECTS)) do @%append $(OBJS)\splash.lbc file %i - @for %i in ( $(__WXLIB_MEDIA_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\splash.lbc library %i - @%append $(OBJS)\splash.lbc option resource=$(OBJS)\splash_sample.res - @for %i in () do @%append $(OBJS)\splash.lbc option stack=%i - wlink @$(OBJS)\splash.lbc - -data : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (splash.png press.mpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\splash_splash.obj : .AUTODEPEND .\splash.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(SPLASH_CXXFLAGS) $< - -$(OBJS)\splash_sample.res : .AUTODEPEND .\..\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_MEDIA_p = +!ifeq MONOLITHIC 0 +!ifeq USE_MEDIA 1 +__WXLIB_MEDIA_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib +!endif +!endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +SPLASH_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +SPLASH_OBJECTS = & + $(OBJS)\splash_splash.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\splash.exe data + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\splash.exe del $(OBJS)\splash.exe + +$(OBJS)\splash.exe : $(SPLASH_OBJECTS) $(OBJS)\splash_sample.res + @%create $(OBJS)\splash.lbc + @%append $(OBJS)\splash.lbc option quiet + @%append $(OBJS)\splash.lbc name $^@ + @%append $(OBJS)\splash.lbc option caseexact + @%append $(OBJS)\splash.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(SPLASH_OBJECTS)) do @%append $(OBJS)\splash.lbc file %i + @for %i in ( $(__WXLIB_MEDIA_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\splash.lbc library %i + @%append $(OBJS)\splash.lbc option resource=$(OBJS)\splash_sample.res + @for %i in () do @%append $(OBJS)\splash.lbc option stack=%i + wlink @$(OBJS)\splash.lbc + +data : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (splash.png press.mpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\splash_splash.obj : .AUTODEPEND .\splash.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(SPLASH_CXXFLAGS) $< + +$(OBJS)\splash_sample.res : .AUTODEPEND .\..\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/splash/splash.dsp b/samples/splash/splash.dsp index 6baa6de558..87bbac2f8f 100644 --- a/samples/splash/splash.dsp +++ b/samples/splash/splash.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\splash" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\splash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\splash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\splash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\splash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\splash" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\splash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\splash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\splash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\splash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\splash" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\splash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\splash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\splash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\splash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\splash" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\splash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\splash.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\splash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\splash.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/splash/splash_vc7.vcproj b/samples/splash/splash_vc7.vcproj index ab02005777..0d740afc64 100644 --- a/samples/splash/splash_vc7.vcproj +++ b/samples/splash/splash_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\splash.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\splash.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\splash.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\splash.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\splash.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\splash.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\splash.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\splash.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\splash.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\splash.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\splash.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\splash.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SPLITTER_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\splitter.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -SPLITTER_OBJECTS = \ - $(OBJS)\splitter_splitter.obj \ - $(OBJS)\splitter_splitter.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\splitter.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\splitter.exe del $(OBJS)\splitter.exe - -if exist $(OBJS)\splitter.ilk del $(OBJS)\splitter.ilk - -if exist $(OBJS)\splitter.pdb del $(OBJS)\splitter.pdb - -$(OBJS)\splitter.exe: $(SPLITTER_OBJECTS) $(OBJS)\splitter_splitter.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\splitter.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(SPLITTER_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\splitter_splitter.obj: .\splitter.cpp - $(CXX) /c /nologo /TP /Fo$@ $(SPLITTER_CXXFLAGS) .\splitter.cpp - -$(OBJS)\splitter_splitter.res: .\splitter.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\splitter.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +SPLITTER_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\splitter.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +SPLITTER_OBJECTS = \ + $(OBJS)\splitter_splitter.obj +SPLITTER_RESOURCES = \ + $(OBJS)\splitter_splitter.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\splitter.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\splitter.exe del $(OBJS)\splitter.exe + -if exist $(OBJS)\splitter.ilk del $(OBJS)\splitter.ilk + -if exist $(OBJS)\splitter.pdb del $(OBJS)\splitter.pdb + +$(OBJS)\splitter.exe: $(SPLITTER_OBJECTS) $(OBJS)\splitter_splitter.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\splitter.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(SPLITTER_OBJECTS) $(SPLITTER_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\splitter_splitter.obj: .\splitter.cpp + $(CXX) /c /nologo /TP /Fo$@ $(SPLITTER_CXXFLAGS) .\splitter.cpp + +$(OBJS)\splitter_splitter.res: .\splitter.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\splitter.rc + diff --git a/samples/splitter/makefile.wat b/samples/splitter/makefile.wat index 0cd238b72f..c23e63f399 100644 --- a/samples/splitter/makefile.wat +++ b/samples/splitter/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SPLITTER_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -SPLITTER_OBJECTS = & - $(OBJS)\splitter_splitter.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\splitter.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\splitter.exe del $(OBJS)\splitter.exe - -$(OBJS)\splitter.exe : $(SPLITTER_OBJECTS) $(OBJS)\splitter_splitter.res - @%create $(OBJS)\splitter.lbc - @%append $(OBJS)\splitter.lbc option quiet - @%append $(OBJS)\splitter.lbc name $^@ - @%append $(OBJS)\splitter.lbc option caseexact - @%append $(OBJS)\splitter.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(SPLITTER_OBJECTS)) do @%append $(OBJS)\splitter.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\splitter.lbc library %i - @%append $(OBJS)\splitter.lbc option resource=$(OBJS)\splitter_splitter.res - @for %i in () do @%append $(OBJS)\splitter.lbc option stack=%i - wlink @$(OBJS)\splitter.lbc - -$(OBJS)\splitter_splitter.obj : .AUTODEPEND .\splitter.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(SPLITTER_CXXFLAGS) $< - -$(OBJS)\splitter_splitter.res : .AUTODEPEND .\splitter.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +SPLITTER_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +SPLITTER_OBJECTS = & + $(OBJS)\splitter_splitter.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\splitter.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\splitter.exe del $(OBJS)\splitter.exe + +$(OBJS)\splitter.exe : $(SPLITTER_OBJECTS) $(OBJS)\splitter_splitter.res + @%create $(OBJS)\splitter.lbc + @%append $(OBJS)\splitter.lbc option quiet + @%append $(OBJS)\splitter.lbc name $^@ + @%append $(OBJS)\splitter.lbc option caseexact + @%append $(OBJS)\splitter.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(SPLITTER_OBJECTS)) do @%append $(OBJS)\splitter.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\splitter.lbc library %i + @%append $(OBJS)\splitter.lbc option resource=$(OBJS)\splitter_splitter.res + @for %i in () do @%append $(OBJS)\splitter.lbc option stack=%i + wlink @$(OBJS)\splitter.lbc + +$(OBJS)\splitter_splitter.obj : .AUTODEPEND .\splitter.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(SPLITTER_CXXFLAGS) $< + +$(OBJS)\splitter_splitter.res : .AUTODEPEND .\splitter.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/splitter/splitter.dsp b/samples/splitter/splitter.dsp index db05f3ae44..b29f31768b 100644 --- a/samples/splitter/splitter.dsp +++ b/samples/splitter/splitter.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\splitter" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\splitter.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\splitter.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\splitter.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\splitter.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\splitter" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\splitter.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\splitter.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\splitter.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\splitter.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\splitter" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\splitter.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\splitter.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\splitter.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\splitter.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\splitter" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\splitter.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\splitter.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\splitter.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\splitter.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/splitter/splitter_vc7.vcproj b/samples/splitter/splitter_vc7.vcproj index 866833f977..e9c4cf8d82 100644 --- a/samples/splitter/splitter_vc7.vcproj +++ b/samples/splitter/splitter_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\splitter.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\splitter.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\splitter.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\splitter.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\splitter.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\splitter.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\splitter.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\splitter.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\splitter.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\splitter.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\splitter.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\splitter.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -STATBAR_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\statbar.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -STATBAR_OBJECTS = \ - $(OBJS)\statbar_statbar.obj \ - $(OBJS)\statbar_statbar.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\statbar.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\statbar.exe del $(OBJS)\statbar.exe - -if exist $(OBJS)\statbar.ilk del $(OBJS)\statbar.ilk - -if exist $(OBJS)\statbar.pdb del $(OBJS)\statbar.pdb - -$(OBJS)\statbar.exe: $(STATBAR_OBJECTS) $(OBJS)\statbar_statbar.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\statbar.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(STATBAR_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\statbar_statbar.obj: .\statbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(STATBAR_CXXFLAGS) .\statbar.cpp - -$(OBJS)\statbar_statbar.res: .\statbar.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\statbar.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +STATBAR_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\statbar.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +STATBAR_OBJECTS = \ + $(OBJS)\statbar_statbar.obj +STATBAR_RESOURCES = \ + $(OBJS)\statbar_statbar.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\statbar.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\statbar.exe del $(OBJS)\statbar.exe + -if exist $(OBJS)\statbar.ilk del $(OBJS)\statbar.ilk + -if exist $(OBJS)\statbar.pdb del $(OBJS)\statbar.pdb + +$(OBJS)\statbar.exe: $(STATBAR_OBJECTS) $(OBJS)\statbar_statbar.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\statbar.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(STATBAR_OBJECTS) $(STATBAR_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\statbar_statbar.obj: .\statbar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(STATBAR_CXXFLAGS) .\statbar.cpp + +$(OBJS)\statbar_statbar.res: .\statbar.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\statbar.rc + diff --git a/samples/statbar/makefile.wat b/samples/statbar/makefile.wat index 702fbbeed3..b2d898edfc 100644 --- a/samples/statbar/makefile.wat +++ b/samples/statbar/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -STATBAR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -STATBAR_OBJECTS = & - $(OBJS)\statbar_statbar.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\statbar.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\statbar.exe del $(OBJS)\statbar.exe - -$(OBJS)\statbar.exe : $(STATBAR_OBJECTS) $(OBJS)\statbar_statbar.res - @%create $(OBJS)\statbar.lbc - @%append $(OBJS)\statbar.lbc option quiet - @%append $(OBJS)\statbar.lbc name $^@ - @%append $(OBJS)\statbar.lbc option caseexact - @%append $(OBJS)\statbar.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(STATBAR_OBJECTS)) do @%append $(OBJS)\statbar.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\statbar.lbc library %i - @%append $(OBJS)\statbar.lbc option resource=$(OBJS)\statbar_statbar.res - @for %i in () do @%append $(OBJS)\statbar.lbc option stack=%i - wlink @$(OBJS)\statbar.lbc - -$(OBJS)\statbar_statbar.obj : .AUTODEPEND .\statbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STATBAR_CXXFLAGS) $< - -$(OBJS)\statbar_statbar.res : .AUTODEPEND .\statbar.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +STATBAR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +STATBAR_OBJECTS = & + $(OBJS)\statbar_statbar.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\statbar.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\statbar.exe del $(OBJS)\statbar.exe + +$(OBJS)\statbar.exe : $(STATBAR_OBJECTS) $(OBJS)\statbar_statbar.res + @%create $(OBJS)\statbar.lbc + @%append $(OBJS)\statbar.lbc option quiet + @%append $(OBJS)\statbar.lbc name $^@ + @%append $(OBJS)\statbar.lbc option caseexact + @%append $(OBJS)\statbar.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(STATBAR_OBJECTS)) do @%append $(OBJS)\statbar.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\statbar.lbc library %i + @%append $(OBJS)\statbar.lbc option resource=$(OBJS)\statbar_statbar.res + @for %i in () do @%append $(OBJS)\statbar.lbc option stack=%i + wlink @$(OBJS)\statbar.lbc + +$(OBJS)\statbar_statbar.obj : .AUTODEPEND .\statbar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(STATBAR_CXXFLAGS) $< + +$(OBJS)\statbar_statbar.res : .AUTODEPEND .\statbar.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/statbar/statbar.dsp b/samples/statbar/statbar.dsp index aa583bcdd9..74abafc85e 100644 --- a/samples/statbar/statbar.dsp +++ b/samples/statbar/statbar.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\statbar" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\statbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\statbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\statbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\statbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\statbar" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\statbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\statbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\statbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\statbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\statbar" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\statbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\statbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\statbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\statbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\statbar" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\statbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\statbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\statbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\statbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/statbar/statbar_vc7.vcproj b/samples/statbar/statbar_vc7.vcproj index fa9033ee58..39e174dbf5 100644 --- a/samples/statbar/statbar_vc7.vcproj +++ b/samples/statbar/statbar_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\statbar.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\statbar.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\statbar.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\statbar.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\statbar.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\statbar.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\statbar.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\statbar.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\statbar.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\statbar.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\statbar.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\statbar.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -STCTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\stctest.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -STCTEST_OBJECTS = \ - $(OBJS)\stctest_stctest.obj \ - $(OBJS)\stctest_edit.obj \ - $(OBJS)\stctest_prefs.obj \ - $(OBJS)\stctest_sample.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_STC_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\stctest.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\stctest.exe del $(OBJS)\stctest.exe - -if exist $(OBJS)\stctest.ilk del $(OBJS)\stctest.ilk - -if exist $(OBJS)\stctest.pdb del $(OBJS)\stctest.pdb - -$(OBJS)\stctest.exe: $(STCTEST_OBJECTS) $(OBJS)\stctest_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\stctest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(STCTEST_OBJECTS) $(__WXLIB_STC_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxscintilla$(WXDEBUGFLAG).lib $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (stctest.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\stctest_stctest.obj: .\stctest.cpp - $(CXX) /c /nologo /TP /Fo$@ $(STCTEST_CXXFLAGS) .\stctest.cpp - -$(OBJS)\stctest_edit.obj: .\edit.cpp - $(CXX) /c /nologo /TP /Fo$@ $(STCTEST_CXXFLAGS) .\edit.cpp - -$(OBJS)\stctest_prefs.obj: .\prefs.cpp - $(CXX) /c /nologo /TP /Fo$@ $(STCTEST_CXXFLAGS) .\prefs.cpp - -$(OBJS)\stctest_sample.res: .\..\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +STCTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\stctest.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +STCTEST_OBJECTS = \ + $(OBJS)\stctest_stctest.obj \ + $(OBJS)\stctest_edit.obj \ + $(OBJS)\stctest_prefs.obj +STCTEST_RESOURCES = \ + $(OBJS)\stctest_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_STC_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\stctest.exe data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\stctest.exe del $(OBJS)\stctest.exe + -if exist $(OBJS)\stctest.ilk del $(OBJS)\stctest.ilk + -if exist $(OBJS)\stctest.pdb del $(OBJS)\stctest.pdb + +$(OBJS)\stctest.exe: $(STCTEST_OBJECTS) $(OBJS)\stctest_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\stctest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(STCTEST_OBJECTS) $(STCTEST_RESOURCES) $(__WXLIB_STC_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxscintilla$(WXDEBUGFLAG).lib $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (stctest.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\stctest_stctest.obj: .\stctest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(STCTEST_CXXFLAGS) .\stctest.cpp + +$(OBJS)\stctest_edit.obj: .\edit.cpp + $(CXX) /c /nologo /TP /Fo$@ $(STCTEST_CXXFLAGS) .\edit.cpp + +$(OBJS)\stctest_prefs.obj: .\prefs.cpp + $(CXX) /c /nologo /TP /Fo$@ $(STCTEST_CXXFLAGS) .\prefs.cpp + +$(OBJS)\stctest_sample.res: .\..\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc + diff --git a/samples/stc/makefile.wat b/samples/stc/makefile.wat index 623bead306..2d867b26fd 100644 --- a/samples/stc/makefile.wat +++ b/samples/stc/makefile.wat @@ -1,277 +1,277 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_STC_p = -!ifeq MONOLITHIC 0 -__WXLIB_STC_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -STCTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -STCTEST_OBJECTS = & - $(OBJS)\stctest_stctest.obj & - $(OBJS)\stctest_edit.obj & - $(OBJS)\stctest_prefs.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\stctest.exe data - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\stctest.exe del $(OBJS)\stctest.exe - -$(OBJS)\stctest.exe : $(STCTEST_OBJECTS) $(OBJS)\stctest_sample.res - @%create $(OBJS)\stctest.lbc - @%append $(OBJS)\stctest.lbc option quiet - @%append $(OBJS)\stctest.lbc name $^@ - @%append $(OBJS)\stctest.lbc option caseexact - @%append $(OBJS)\stctest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(STCTEST_OBJECTS)) do @%append $(OBJS)\stctest.lbc file %i - @for %i in ( $(__WXLIB_STC_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxscintilla$(WXDEBUGFLAG).lib $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\stctest.lbc library %i - @%append $(OBJS)\stctest.lbc option resource=$(OBJS)\stctest_sample.res - @for %i in () do @%append $(OBJS)\stctest.lbc option stack=%i - wlink @$(OBJS)\stctest.lbc - -data : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (stctest.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\stctest_stctest.obj : .AUTODEPEND .\stctest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STCTEST_CXXFLAGS) $< - -$(OBJS)\stctest_edit.obj : .AUTODEPEND .\edit.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STCTEST_CXXFLAGS) $< - -$(OBJS)\stctest_prefs.obj : .AUTODEPEND .\prefs.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STCTEST_CXXFLAGS) $< - -$(OBJS)\stctest_sample.res : .AUTODEPEND .\..\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_STC_p = +!ifeq MONOLITHIC 0 +__WXLIB_STC_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +STCTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +STCTEST_OBJECTS = & + $(OBJS)\stctest_stctest.obj & + $(OBJS)\stctest_edit.obj & + $(OBJS)\stctest_prefs.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\stctest.exe data + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\stctest.exe del $(OBJS)\stctest.exe + +$(OBJS)\stctest.exe : $(STCTEST_OBJECTS) $(OBJS)\stctest_sample.res + @%create $(OBJS)\stctest.lbc + @%append $(OBJS)\stctest.lbc option quiet + @%append $(OBJS)\stctest.lbc name $^@ + @%append $(OBJS)\stctest.lbc option caseexact + @%append $(OBJS)\stctest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(STCTEST_OBJECTS)) do @%append $(OBJS)\stctest.lbc file %i + @for %i in ( $(__WXLIB_STC_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxscintilla$(WXDEBUGFLAG).lib $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\stctest.lbc library %i + @%append $(OBJS)\stctest.lbc option resource=$(OBJS)\stctest_sample.res + @for %i in () do @%append $(OBJS)\stctest.lbc option stack=%i + wlink @$(OBJS)\stctest.lbc + +data : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (stctest.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\stctest_stctest.obj : .AUTODEPEND .\stctest.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(STCTEST_CXXFLAGS) $< + +$(OBJS)\stctest_edit.obj : .AUTODEPEND .\edit.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(STCTEST_CXXFLAGS) $< + +$(OBJS)\stctest_prefs.obj : .AUTODEPEND .\prefs.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(STCTEST_CXXFLAGS) $< + +$(OBJS)\stctest_sample.res : .AUTODEPEND .\..\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/stc/stctest.dsp b/samples/stc/stctest.dsp index ecc3e19a1e..db6d982457 100644 --- a/samples/stc/stctest.dsp +++ b/samples/stc/stctest.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\stctest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\stctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\stctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\stctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\stctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\stctest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\stctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\stctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\stctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\stctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\stctest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\stctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\stctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\stctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\stctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\stctest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\stctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\stctest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\stctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\stctest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/stc/stctest_vc7.vcproj b/samples/stc/stctest_vc7.vcproj index e8cd6ed106..d455924d27 100644 --- a/samples/stc/stctest_vc7.vcproj +++ b/samples/stc/stctest_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_stc.lib wxmsw29u_core.lib wxbase29u.lib wxscintilla.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\stctest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\stctest.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_stc.lib wxmsw29u_core.lib wxbase29u.lib wxscintilla.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\stctest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\stctest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_stc.lib wxmsw29u_core.lib wxbase29u.lib wxscintilla.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\stctest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\stctest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_stc.lib wxmswuniv29u_core.lib wxbase29u.lib wxscintilla.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\stctest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\stctest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_stc.lib wxmsw29u_core.lib wxbase29u.lib wxscintilla.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\stctest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\stctest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_stc.lib wxmswuniv29u_core.lib wxbase29u.lib wxscintilla.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\stctest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\stctest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SVGTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\svgtest.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -SVGTEST_OBJECTS = \ - $(OBJS)\svgtest_sample.res \ - $(OBJS)\svgtest_svgtest.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\svgtest.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe - -if exist $(OBJS)\svgtest.ilk del $(OBJS)\svgtest.ilk - -if exist $(OBJS)\svgtest.pdb del $(OBJS)\svgtest.pdb - -$(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\svgtest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(SVGTEST_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\svgtest_sample.res: .\..\..\samples\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc - -$(OBJS)\svgtest_svgtest.obj: .\svgtest.cpp - $(CXX) /c /nologo /TP /Fo$@ $(SVGTEST_CXXFLAGS) .\svgtest.cpp - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +SVGTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\svgtest.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +SVGTEST_OBJECTS = \ + $(OBJS)\svgtest_svgtest.obj +SVGTEST_RESOURCES = \ + $(OBJS)\svgtest_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\svgtest.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe + -if exist $(OBJS)\svgtest.ilk del $(OBJS)\svgtest.ilk + -if exist $(OBJS)\svgtest.pdb del $(OBJS)\svgtest.pdb + +$(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\svgtest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(SVGTEST_OBJECTS) $(SVGTEST_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\svgtest_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + +$(OBJS)\svgtest_svgtest.obj: .\svgtest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(SVGTEST_CXXFLAGS) .\svgtest.cpp + diff --git a/samples/svg/makefile.wat b/samples/svg/makefile.wat index 71a96b8821..dad50aab9d 100644 --- a/samples/svg/makefile.wat +++ b/samples/svg/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SVGTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -SVGTEST_OBJECTS = & - $(OBJS)\svgtest_svgtest.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\svgtest.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe - -$(OBJS)\svgtest.exe : $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample.res - @%create $(OBJS)\svgtest.lbc - @%append $(OBJS)\svgtest.lbc option quiet - @%append $(OBJS)\svgtest.lbc name $^@ - @%append $(OBJS)\svgtest.lbc option caseexact - @%append $(OBJS)\svgtest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(SVGTEST_OBJECTS)) do @%append $(OBJS)\svgtest.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\svgtest.lbc library %i - @%append $(OBJS)\svgtest.lbc option resource=$(OBJS)\svgtest_sample.res - @for %i in () do @%append $(OBJS)\svgtest.lbc option stack=%i - wlink @$(OBJS)\svgtest.lbc - -$(OBJS)\svgtest_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - -$(OBJS)\svgtest_svgtest.obj : .AUTODEPEND .\svgtest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(SVGTEST_CXXFLAGS) $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +SVGTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +SVGTEST_OBJECTS = & + $(OBJS)\svgtest_svgtest.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\svgtest.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe + +$(OBJS)\svgtest.exe : $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample.res + @%create $(OBJS)\svgtest.lbc + @%append $(OBJS)\svgtest.lbc option quiet + @%append $(OBJS)\svgtest.lbc name $^@ + @%append $(OBJS)\svgtest.lbc option caseexact + @%append $(OBJS)\svgtest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(SVGTEST_OBJECTS)) do @%append $(OBJS)\svgtest.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\svgtest.lbc library %i + @%append $(OBJS)\svgtest.lbc option resource=$(OBJS)\svgtest_sample.res + @for %i in () do @%append $(OBJS)\svgtest.lbc option stack=%i + wlink @$(OBJS)\svgtest.lbc + +$(OBJS)\svgtest_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + +$(OBJS)\svgtest_svgtest.obj : .AUTODEPEND .\svgtest.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(SVGTEST_CXXFLAGS) $< + diff --git a/samples/svg/svgtest.dsp b/samples/svg/svgtest.dsp index b3f0ced7b6..fd97d63d66 100644 --- a/samples/svg/svgtest.dsp +++ b/samples/svg/svgtest.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\svgtest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\svgtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\svgtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\svgtest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\svgtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\svgtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\svgtest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\svgtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\svgtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\svgtest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\svgtest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\svgtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\svgtest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/svg/svgtest_vc7.vcproj b/samples/svg/svgtest_vc7.vcproj index c2d9625adc..7c0cecd7de 100644 --- a/samples/svg/svgtest_vc7.vcproj +++ b/samples/svg/svgtest_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\svgtest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\svgtest.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\svgtest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\svgtest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\svgtest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\svgtest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\svgtest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\svgtest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\svgtest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\svgtest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\svgtest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\svgtest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TABORDER_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\taborder.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -TABORDER_OBJECTS = \ - $(OBJS)\taborder_sample.res \ - $(OBJS)\taborder_taborder.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\taborder.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\taborder.exe del $(OBJS)\taborder.exe - -if exist $(OBJS)\taborder.ilk del $(OBJS)\taborder.ilk - -if exist $(OBJS)\taborder.pdb del $(OBJS)\taborder.pdb - -$(OBJS)\taborder.exe: $(TABORDER_OBJECTS) $(OBJS)\taborder_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\taborder.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(TABORDER_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\taborder_sample.res: .\..\..\samples\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc - -$(OBJS)\taborder_taborder.obj: .\taborder.cpp - $(CXX) /c /nologo /TP /Fo$@ $(TABORDER_CXXFLAGS) .\taborder.cpp - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +TABORDER_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\taborder.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +TABORDER_OBJECTS = \ + $(OBJS)\taborder_taborder.obj +TABORDER_RESOURCES = \ + $(OBJS)\taborder_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\taborder.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\taborder.exe del $(OBJS)\taborder.exe + -if exist $(OBJS)\taborder.ilk del $(OBJS)\taborder.ilk + -if exist $(OBJS)\taborder.pdb del $(OBJS)\taborder.pdb + +$(OBJS)\taborder.exe: $(TABORDER_OBJECTS) $(OBJS)\taborder_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\taborder.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(TABORDER_OBJECTS) $(TABORDER_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\taborder_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + +$(OBJS)\taborder_taborder.obj: .\taborder.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TABORDER_CXXFLAGS) .\taborder.cpp + diff --git a/samples/taborder/makefile.wat b/samples/taborder/makefile.wat index 561d91e48e..7154e82c9f 100644 --- a/samples/taborder/makefile.wat +++ b/samples/taborder/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TABORDER_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -TABORDER_OBJECTS = & - $(OBJS)\taborder_taborder.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\taborder.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\taborder.exe del $(OBJS)\taborder.exe - -$(OBJS)\taborder.exe : $(TABORDER_OBJECTS) $(OBJS)\taborder_sample.res - @%create $(OBJS)\taborder.lbc - @%append $(OBJS)\taborder.lbc option quiet - @%append $(OBJS)\taborder.lbc name $^@ - @%append $(OBJS)\taborder.lbc option caseexact - @%append $(OBJS)\taborder.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(TABORDER_OBJECTS)) do @%append $(OBJS)\taborder.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\taborder.lbc library %i - @%append $(OBJS)\taborder.lbc option resource=$(OBJS)\taborder_sample.res - @for %i in () do @%append $(OBJS)\taborder.lbc option stack=%i - wlink @$(OBJS)\taborder.lbc - -$(OBJS)\taborder_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - -$(OBJS)\taborder_taborder.obj : .AUTODEPEND .\taborder.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TABORDER_CXXFLAGS) $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +TABORDER_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +TABORDER_OBJECTS = & + $(OBJS)\taborder_taborder.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\taborder.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\taborder.exe del $(OBJS)\taborder.exe + +$(OBJS)\taborder.exe : $(TABORDER_OBJECTS) $(OBJS)\taborder_sample.res + @%create $(OBJS)\taborder.lbc + @%append $(OBJS)\taborder.lbc option quiet + @%append $(OBJS)\taborder.lbc name $^@ + @%append $(OBJS)\taborder.lbc option caseexact + @%append $(OBJS)\taborder.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(TABORDER_OBJECTS)) do @%append $(OBJS)\taborder.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\taborder.lbc library %i + @%append $(OBJS)\taborder.lbc option resource=$(OBJS)\taborder_sample.res + @for %i in () do @%append $(OBJS)\taborder.lbc option stack=%i + wlink @$(OBJS)\taborder.lbc + +$(OBJS)\taborder_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + +$(OBJS)\taborder_taborder.obj : .AUTODEPEND .\taborder.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TABORDER_CXXFLAGS) $< + diff --git a/samples/taborder/taborder.dsp b/samples/taborder/taborder.dsp index 7f44ce1d9b..a9bc414d87 100644 --- a/samples/taborder/taborder.dsp +++ b/samples/taborder/taborder.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\taborder" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\taborder.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\taborder.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\taborder.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\taborder.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\taborder" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\taborder.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\taborder.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\taborder.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\taborder.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\taborder" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\taborder.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\taborder.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\taborder.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\taborder.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\taborder" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\taborder.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\taborder.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\taborder.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\taborder.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/taborder/taborder_vc7.vcproj b/samples/taborder/taborder_vc7.vcproj index 9a222f4bd0..b0aedf73bd 100644 --- a/samples/taborder/taborder_vc7.vcproj +++ b/samples/taborder/taborder_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\taborder.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\taborder.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\taborder.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\taborder.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\taborder.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\taborder.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\taborder.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\taborder.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\taborder.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\taborder.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\taborder.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\taborder.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TASKBAR_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\taskbar.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -TASKBAR_OBJECTS = \ - $(OBJS)\taskbar_sample.res \ - $(OBJS)\taskbar_tbtest.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_ADV_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\taskbar.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\taskbar.exe del $(OBJS)\taskbar.exe - -if exist $(OBJS)\taskbar.ilk del $(OBJS)\taskbar.ilk - -if exist $(OBJS)\taskbar.pdb del $(OBJS)\taskbar.pdb - -$(OBJS)\taskbar.exe: $(TASKBAR_OBJECTS) $(OBJS)\taskbar_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\taskbar.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(TASKBAR_OBJECTS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\taskbar_sample.res: .\..\..\samples\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc - -$(OBJS)\taskbar_tbtest.obj: .\tbtest.cpp - $(CXX) /c /nologo /TP /Fo$@ $(TASKBAR_CXXFLAGS) .\tbtest.cpp - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +TASKBAR_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\taskbar.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +TASKBAR_OBJECTS = \ + $(OBJS)\taskbar_tbtest.obj +TASKBAR_RESOURCES = \ + $(OBJS)\taskbar_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_ADV_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\taskbar.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\taskbar.exe del $(OBJS)\taskbar.exe + -if exist $(OBJS)\taskbar.ilk del $(OBJS)\taskbar.ilk + -if exist $(OBJS)\taskbar.pdb del $(OBJS)\taskbar.pdb + +$(OBJS)\taskbar.exe: $(TASKBAR_OBJECTS) $(OBJS)\taskbar_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\taskbar.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(TASKBAR_OBJECTS) $(TASKBAR_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\taskbar_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + +$(OBJS)\taskbar_tbtest.obj: .\tbtest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TASKBAR_CXXFLAGS) .\tbtest.cpp + diff --git a/samples/taskbar/makefile.wat b/samples/taskbar/makefile.wat index 187dac2bef..bcea4f43a5 100644 --- a/samples/taskbar/makefile.wat +++ b/samples/taskbar/makefile.wat @@ -1,265 +1,265 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_ADV_p = -!ifeq MONOLITHIC 0 -__WXLIB_ADV_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TASKBAR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -TASKBAR_OBJECTS = & - $(OBJS)\taskbar_tbtest.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\taskbar.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\taskbar.exe del $(OBJS)\taskbar.exe - -$(OBJS)\taskbar.exe : $(TASKBAR_OBJECTS) $(OBJS)\taskbar_sample.res - @%create $(OBJS)\taskbar.lbc - @%append $(OBJS)\taskbar.lbc option quiet - @%append $(OBJS)\taskbar.lbc name $^@ - @%append $(OBJS)\taskbar.lbc option caseexact - @%append $(OBJS)\taskbar.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(TASKBAR_OBJECTS)) do @%append $(OBJS)\taskbar.lbc file %i - @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\taskbar.lbc library %i - @%append $(OBJS)\taskbar.lbc option resource=$(OBJS)\taskbar_sample.res - @for %i in () do @%append $(OBJS)\taskbar.lbc option stack=%i - wlink @$(OBJS)\taskbar.lbc - -$(OBJS)\taskbar_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - -$(OBJS)\taskbar_tbtest.obj : .AUTODEPEND .\tbtest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TASKBAR_CXXFLAGS) $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +TASKBAR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +TASKBAR_OBJECTS = & + $(OBJS)\taskbar_tbtest.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\taskbar.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\taskbar.exe del $(OBJS)\taskbar.exe + +$(OBJS)\taskbar.exe : $(TASKBAR_OBJECTS) $(OBJS)\taskbar_sample.res + @%create $(OBJS)\taskbar.lbc + @%append $(OBJS)\taskbar.lbc option quiet + @%append $(OBJS)\taskbar.lbc name $^@ + @%append $(OBJS)\taskbar.lbc option caseexact + @%append $(OBJS)\taskbar.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(TASKBAR_OBJECTS)) do @%append $(OBJS)\taskbar.lbc file %i + @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\taskbar.lbc library %i + @%append $(OBJS)\taskbar.lbc option resource=$(OBJS)\taskbar_sample.res + @for %i in () do @%append $(OBJS)\taskbar.lbc option stack=%i + wlink @$(OBJS)\taskbar.lbc + +$(OBJS)\taskbar_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + +$(OBJS)\taskbar_tbtest.obj : .AUTODEPEND .\tbtest.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TASKBAR_CXXFLAGS) $< + diff --git a/samples/taskbar/taskbar.dsp b/samples/taskbar/taskbar.dsp index fd37376df7..21403b8334 100644 --- a/samples/taskbar/taskbar.dsp +++ b/samples/taskbar/taskbar.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\taskbar" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\taskbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\taskbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\taskbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\taskbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\taskbar" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\taskbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\taskbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\taskbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\taskbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\taskbar" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\taskbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\taskbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\taskbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\taskbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\taskbar" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\taskbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\taskbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\taskbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\taskbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/taskbar/taskbar_vc7.vcproj b/samples/taskbar/taskbar_vc7.vcproj index 30e4e242c8..1139995b80 100644 --- a/samples/taskbar/taskbar_vc7.vcproj +++ b/samples/taskbar/taskbar_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\taskbar.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\taskbar.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\taskbar.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\taskbar.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\taskbar.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\taskbar.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\taskbar.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\taskbar.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\taskbar.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\taskbar.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\taskbar.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\taskbar.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TEXT_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\text.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -TEXT_OBJECTS = \ - $(OBJS)\text_text.obj \ - $(OBJS)\text_text.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\text.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\text.exe del $(OBJS)\text.exe - -if exist $(OBJS)\text.ilk del $(OBJS)\text.ilk - -if exist $(OBJS)\text.pdb del $(OBJS)\text.pdb - -$(OBJS)\text.exe: $(TEXT_OBJECTS) $(OBJS)\text_text.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\text.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(TEXT_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\text_text.obj: .\text.cpp - $(CXX) /c /nologo /TP /Fo$@ $(TEXT_CXXFLAGS) .\text.cpp - -$(OBJS)\text_text.res: .\text.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\text.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +TEXT_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\text.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +TEXT_OBJECTS = \ + $(OBJS)\text_text.obj +TEXT_RESOURCES = \ + $(OBJS)\text_text.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\text.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\text.exe del $(OBJS)\text.exe + -if exist $(OBJS)\text.ilk del $(OBJS)\text.ilk + -if exist $(OBJS)\text.pdb del $(OBJS)\text.pdb + +$(OBJS)\text.exe: $(TEXT_OBJECTS) $(OBJS)\text_text.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\text.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(TEXT_OBJECTS) $(TEXT_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\text_text.obj: .\text.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEXT_CXXFLAGS) .\text.cpp + +$(OBJS)\text_text.res: .\text.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\text.rc + diff --git a/samples/text/makefile.wat b/samples/text/makefile.wat index 850b0ee8b7..4eda637772 100644 --- a/samples/text/makefile.wat +++ b/samples/text/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TEXT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -TEXT_OBJECTS = & - $(OBJS)\text_text.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\text.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\text.exe del $(OBJS)\text.exe - -$(OBJS)\text.exe : $(TEXT_OBJECTS) $(OBJS)\text_text.res - @%create $(OBJS)\text.lbc - @%append $(OBJS)\text.lbc option quiet - @%append $(OBJS)\text.lbc name $^@ - @%append $(OBJS)\text.lbc option caseexact - @%append $(OBJS)\text.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(TEXT_OBJECTS)) do @%append $(OBJS)\text.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\text.lbc library %i - @%append $(OBJS)\text.lbc option resource=$(OBJS)\text_text.res - @for %i in () do @%append $(OBJS)\text.lbc option stack=%i - wlink @$(OBJS)\text.lbc - -$(OBJS)\text_text.obj : .AUTODEPEND .\text.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TEXT_CXXFLAGS) $< - -$(OBJS)\text_text.res : .AUTODEPEND .\text.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +TEXT_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +TEXT_OBJECTS = & + $(OBJS)\text_text.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\text.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\text.exe del $(OBJS)\text.exe + +$(OBJS)\text.exe : $(TEXT_OBJECTS) $(OBJS)\text_text.res + @%create $(OBJS)\text.lbc + @%append $(OBJS)\text.lbc option quiet + @%append $(OBJS)\text.lbc name $^@ + @%append $(OBJS)\text.lbc option caseexact + @%append $(OBJS)\text.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(TEXT_OBJECTS)) do @%append $(OBJS)\text.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\text.lbc library %i + @%append $(OBJS)\text.lbc option resource=$(OBJS)\text_text.res + @for %i in () do @%append $(OBJS)\text.lbc option stack=%i + wlink @$(OBJS)\text.lbc + +$(OBJS)\text_text.obj : .AUTODEPEND .\text.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TEXT_CXXFLAGS) $< + +$(OBJS)\text_text.res : .AUTODEPEND .\text.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/text/text.dsp b/samples/text/text.dsp index 87a87b56bd..a8d35fef6f 100644 --- a/samples/text/text.dsp +++ b/samples/text/text.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\text" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\text.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\text.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\text.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\text.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\text" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\text.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\text.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\text.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\text.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\text" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\text.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\text.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\text.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\text.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\text" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\text.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\text.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\text.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\text.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/text/text_vc7.vcproj b/samples/text/text_vc7.vcproj index d5306e26a7..e05ebeed19 100644 --- a/samples/text/text_vc7.vcproj +++ b/samples/text/text_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\text.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\text.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\text.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\text.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\text.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\text.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\text.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\text.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\text.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\text.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\text.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\text.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -THREAD_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\thread.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -THREAD_OBJECTS = \ - $(OBJS)\thread_thread.obj \ - $(OBJS)\thread_thread.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\thread.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\thread.exe del $(OBJS)\thread.exe - -if exist $(OBJS)\thread.ilk del $(OBJS)\thread.ilk - -if exist $(OBJS)\thread.pdb del $(OBJS)\thread.pdb - -$(OBJS)\thread.exe: $(THREAD_OBJECTS) $(OBJS)\thread_thread.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\thread.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(THREAD_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\thread_thread.obj: .\thread.cpp - $(CXX) /c /nologo /TP /Fo$@ $(THREAD_CXXFLAGS) .\thread.cpp - -$(OBJS)\thread_thread.res: .\thread.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\thread.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +THREAD_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\thread.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +THREAD_OBJECTS = \ + $(OBJS)\thread_thread.obj +THREAD_RESOURCES = \ + $(OBJS)\thread_thread.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\thread.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\thread.exe del $(OBJS)\thread.exe + -if exist $(OBJS)\thread.ilk del $(OBJS)\thread.ilk + -if exist $(OBJS)\thread.pdb del $(OBJS)\thread.pdb + +$(OBJS)\thread.exe: $(THREAD_OBJECTS) $(OBJS)\thread_thread.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\thread.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(THREAD_OBJECTS) $(THREAD_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\thread_thread.obj: .\thread.cpp + $(CXX) /c /nologo /TP /Fo$@ $(THREAD_CXXFLAGS) .\thread.cpp + +$(OBJS)\thread_thread.res: .\thread.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\thread.rc + diff --git a/samples/thread/makefile.wat b/samples/thread/makefile.wat index 0ac58b165e..54ba400aa9 100644 --- a/samples/thread/makefile.wat +++ b/samples/thread/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -THREAD_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -THREAD_OBJECTS = & - $(OBJS)\thread_thread.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\thread.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\thread.exe del $(OBJS)\thread.exe - -$(OBJS)\thread.exe : $(THREAD_OBJECTS) $(OBJS)\thread_thread.res - @%create $(OBJS)\thread.lbc - @%append $(OBJS)\thread.lbc option quiet - @%append $(OBJS)\thread.lbc name $^@ - @%append $(OBJS)\thread.lbc option caseexact - @%append $(OBJS)\thread.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(THREAD_OBJECTS)) do @%append $(OBJS)\thread.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\thread.lbc library %i - @%append $(OBJS)\thread.lbc option resource=$(OBJS)\thread_thread.res - @for %i in () do @%append $(OBJS)\thread.lbc option stack=%i - wlink @$(OBJS)\thread.lbc - -$(OBJS)\thread_thread.obj : .AUTODEPEND .\thread.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(THREAD_CXXFLAGS) $< - -$(OBJS)\thread_thread.res : .AUTODEPEND .\thread.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +THREAD_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +THREAD_OBJECTS = & + $(OBJS)\thread_thread.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\thread.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\thread.exe del $(OBJS)\thread.exe + +$(OBJS)\thread.exe : $(THREAD_OBJECTS) $(OBJS)\thread_thread.res + @%create $(OBJS)\thread.lbc + @%append $(OBJS)\thread.lbc option quiet + @%append $(OBJS)\thread.lbc name $^@ + @%append $(OBJS)\thread.lbc option caseexact + @%append $(OBJS)\thread.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(THREAD_OBJECTS)) do @%append $(OBJS)\thread.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\thread.lbc library %i + @%append $(OBJS)\thread.lbc option resource=$(OBJS)\thread_thread.res + @for %i in () do @%append $(OBJS)\thread.lbc option stack=%i + wlink @$(OBJS)\thread.lbc + +$(OBJS)\thread_thread.obj : .AUTODEPEND .\thread.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(THREAD_CXXFLAGS) $< + +$(OBJS)\thread_thread.res : .AUTODEPEND .\thread.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/thread/thread.dsp b/samples/thread/thread.dsp index e04780ef08..d084d8c66b 100644 --- a/samples/thread/thread.dsp +++ b/samples/thread/thread.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\thread" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\thread.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\thread.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\thread.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\thread.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\thread" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\thread.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\thread.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\thread.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\thread.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\thread" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\thread.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\thread.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\thread.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\thread.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\thread" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\thread.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\thread.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\thread.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\thread.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/thread/thread_vc7.vcproj b/samples/thread/thread_vc7.vcproj index 3efb972f55..5884923aed 100644 --- a/samples/thread/thread_vc7.vcproj +++ b/samples/thread/thread_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\thread.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\thread.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\thread.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\thread.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\thread.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\thread.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\thread.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\thread.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\thread.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\thread.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\thread.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\thread.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TOOLBAR_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\toolbar.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -TOOLBAR_OBJECTS = \ - $(OBJS)\toolbar_toolbar.obj \ - $(OBJS)\toolbar_toolbar.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\toolbar.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\toolbar.exe del $(OBJS)\toolbar.exe - -if exist $(OBJS)\toolbar.ilk del $(OBJS)\toolbar.ilk - -if exist $(OBJS)\toolbar.pdb del $(OBJS)\toolbar.pdb - -$(OBJS)\toolbar.exe: $(TOOLBAR_OBJECTS) $(OBJS)\toolbar_toolbar.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\toolbar.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(TOOLBAR_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\toolbar_toolbar.obj: .\toolbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(TOOLBAR_CXXFLAGS) .\toolbar.cpp - -$(OBJS)\toolbar_toolbar.res: .\toolbar.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\toolbar.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +TOOLBAR_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\toolbar.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +TOOLBAR_OBJECTS = \ + $(OBJS)\toolbar_toolbar.obj +TOOLBAR_RESOURCES = \ + $(OBJS)\toolbar_toolbar.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\toolbar.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\toolbar.exe del $(OBJS)\toolbar.exe + -if exist $(OBJS)\toolbar.ilk del $(OBJS)\toolbar.ilk + -if exist $(OBJS)\toolbar.pdb del $(OBJS)\toolbar.pdb + +$(OBJS)\toolbar.exe: $(TOOLBAR_OBJECTS) $(OBJS)\toolbar_toolbar.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\toolbar.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(TOOLBAR_OBJECTS) $(TOOLBAR_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\toolbar_toolbar.obj: .\toolbar.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TOOLBAR_CXXFLAGS) .\toolbar.cpp + +$(OBJS)\toolbar_toolbar.res: .\toolbar.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\toolbar.rc + diff --git a/samples/toolbar/makefile.wat b/samples/toolbar/makefile.wat index 13e374628c..999c986f6d 100644 --- a/samples/toolbar/makefile.wat +++ b/samples/toolbar/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TOOLBAR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -TOOLBAR_OBJECTS = & - $(OBJS)\toolbar_toolbar.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\toolbar.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\toolbar.exe del $(OBJS)\toolbar.exe - -$(OBJS)\toolbar.exe : $(TOOLBAR_OBJECTS) $(OBJS)\toolbar_toolbar.res - @%create $(OBJS)\toolbar.lbc - @%append $(OBJS)\toolbar.lbc option quiet - @%append $(OBJS)\toolbar.lbc name $^@ - @%append $(OBJS)\toolbar.lbc option caseexact - @%append $(OBJS)\toolbar.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(TOOLBAR_OBJECTS)) do @%append $(OBJS)\toolbar.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\toolbar.lbc library %i - @%append $(OBJS)\toolbar.lbc option resource=$(OBJS)\toolbar_toolbar.res - @for %i in () do @%append $(OBJS)\toolbar.lbc option stack=%i - wlink @$(OBJS)\toolbar.lbc - -$(OBJS)\toolbar_toolbar.obj : .AUTODEPEND .\toolbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TOOLBAR_CXXFLAGS) $< - -$(OBJS)\toolbar_toolbar.res : .AUTODEPEND .\toolbar.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +TOOLBAR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +TOOLBAR_OBJECTS = & + $(OBJS)\toolbar_toolbar.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\toolbar.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\toolbar.exe del $(OBJS)\toolbar.exe + +$(OBJS)\toolbar.exe : $(TOOLBAR_OBJECTS) $(OBJS)\toolbar_toolbar.res + @%create $(OBJS)\toolbar.lbc + @%append $(OBJS)\toolbar.lbc option quiet + @%append $(OBJS)\toolbar.lbc name $^@ + @%append $(OBJS)\toolbar.lbc option caseexact + @%append $(OBJS)\toolbar.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(TOOLBAR_OBJECTS)) do @%append $(OBJS)\toolbar.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\toolbar.lbc library %i + @%append $(OBJS)\toolbar.lbc option resource=$(OBJS)\toolbar_toolbar.res + @for %i in () do @%append $(OBJS)\toolbar.lbc option stack=%i + wlink @$(OBJS)\toolbar.lbc + +$(OBJS)\toolbar_toolbar.obj : .AUTODEPEND .\toolbar.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TOOLBAR_CXXFLAGS) $< + +$(OBJS)\toolbar_toolbar.res : .AUTODEPEND .\toolbar.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/toolbar/toolbar.dsp b/samples/toolbar/toolbar.dsp index 1bb727d3bd..5361a87179 100644 --- a/samples/toolbar/toolbar.dsp +++ b/samples/toolbar/toolbar.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\toolbar" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\toolbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\toolbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\toolbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\toolbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\toolbar" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\toolbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\toolbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\toolbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\toolbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\toolbar" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\toolbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\toolbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\toolbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\toolbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\toolbar" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\toolbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\toolbar.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\toolbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\toolbar.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/toolbar/toolbar_vc7.vcproj b/samples/toolbar/toolbar_vc7.vcproj index ea3b132472..8392de9ba5 100644 --- a/samples/toolbar/toolbar_vc7.vcproj +++ b/samples/toolbar/toolbar_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\toolbar.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\toolbar.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\toolbar.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\toolbar.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\toolbar.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\toolbar.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\toolbar.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\toolbar.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\toolbar.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\toolbar.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\toolbar.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\toolbar.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TREECTRL_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\treectrl.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -TREECTRL_OBJECTS = \ - $(OBJS)\treectrl_treetest.obj \ - $(OBJS)\treectrl_sample.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\treectrl.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\treectrl.exe del $(OBJS)\treectrl.exe - -if exist $(OBJS)\treectrl.ilk del $(OBJS)\treectrl.ilk - -if exist $(OBJS)\treectrl.pdb del $(OBJS)\treectrl.pdb - -$(OBJS)\treectrl.exe: $(TREECTRL_OBJECTS) $(OBJS)\treectrl_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\treectrl.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(TREECTRL_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\treectrl_treetest.obj: .\treetest.cpp - $(CXX) /c /nologo /TP /Fo$@ $(TREECTRL_CXXFLAGS) .\treetest.cpp - -$(OBJS)\treectrl_sample.res: .\..\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +TREECTRL_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\treectrl.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +TREECTRL_OBJECTS = \ + $(OBJS)\treectrl_treetest.obj +TREECTRL_RESOURCES = \ + $(OBJS)\treectrl_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\treectrl.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\treectrl.exe del $(OBJS)\treectrl.exe + -if exist $(OBJS)\treectrl.ilk del $(OBJS)\treectrl.ilk + -if exist $(OBJS)\treectrl.pdb del $(OBJS)\treectrl.pdb + +$(OBJS)\treectrl.exe: $(TREECTRL_OBJECTS) $(OBJS)\treectrl_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\treectrl.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(TREECTRL_OBJECTS) $(TREECTRL_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\treectrl_treetest.obj: .\treetest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TREECTRL_CXXFLAGS) .\treetest.cpp + +$(OBJS)\treectrl_sample.res: .\..\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc + diff --git a/samples/treectrl/makefile.wat b/samples/treectrl/makefile.wat index a4a0407a38..a74d7e02a6 100644 --- a/samples/treectrl/makefile.wat +++ b/samples/treectrl/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TREECTRL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -TREECTRL_OBJECTS = & - $(OBJS)\treectrl_treetest.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\treectrl.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\treectrl.exe del $(OBJS)\treectrl.exe - -$(OBJS)\treectrl.exe : $(TREECTRL_OBJECTS) $(OBJS)\treectrl_sample.res - @%create $(OBJS)\treectrl.lbc - @%append $(OBJS)\treectrl.lbc option quiet - @%append $(OBJS)\treectrl.lbc name $^@ - @%append $(OBJS)\treectrl.lbc option caseexact - @%append $(OBJS)\treectrl.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(TREECTRL_OBJECTS)) do @%append $(OBJS)\treectrl.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\treectrl.lbc library %i - @%append $(OBJS)\treectrl.lbc option resource=$(OBJS)\treectrl_sample.res - @for %i in () do @%append $(OBJS)\treectrl.lbc option stack=%i - wlink @$(OBJS)\treectrl.lbc - -$(OBJS)\treectrl_treetest.obj : .AUTODEPEND .\treetest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TREECTRL_CXXFLAGS) $< - -$(OBJS)\treectrl_sample.res : .AUTODEPEND .\..\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +TREECTRL_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +TREECTRL_OBJECTS = & + $(OBJS)\treectrl_treetest.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\treectrl.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\treectrl.exe del $(OBJS)\treectrl.exe + +$(OBJS)\treectrl.exe : $(TREECTRL_OBJECTS) $(OBJS)\treectrl_sample.res + @%create $(OBJS)\treectrl.lbc + @%append $(OBJS)\treectrl.lbc option quiet + @%append $(OBJS)\treectrl.lbc name $^@ + @%append $(OBJS)\treectrl.lbc option caseexact + @%append $(OBJS)\treectrl.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(TREECTRL_OBJECTS)) do @%append $(OBJS)\treectrl.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\treectrl.lbc library %i + @%append $(OBJS)\treectrl.lbc option resource=$(OBJS)\treectrl_sample.res + @for %i in () do @%append $(OBJS)\treectrl.lbc option stack=%i + wlink @$(OBJS)\treectrl.lbc + +$(OBJS)\treectrl_treetest.obj : .AUTODEPEND .\treetest.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TREECTRL_CXXFLAGS) $< + +$(OBJS)\treectrl_sample.res : .AUTODEPEND .\..\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/treectrl/treectrl.dsp b/samples/treectrl/treectrl.dsp index 590a990b15..e7ffb53a05 100644 --- a/samples/treectrl/treectrl.dsp +++ b/samples/treectrl/treectrl.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\treectrl" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\treectrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\treectrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\treectrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\treectrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\treectrl" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\treectrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\treectrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\treectrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\treectrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\treectrl" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\treectrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\treectrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\treectrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\treectrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\treectrl" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\treectrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\treectrl.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\treectrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\treectrl.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/treectrl/treectrl_vc7.vcproj b/samples/treectrl/treectrl_vc7.vcproj index e20e63b815..919c1d2132 100644 --- a/samples/treectrl/treectrl_vc7.vcproj +++ b/samples/treectrl/treectrl_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\treectrl.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\treectrl.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\treectrl.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\treectrl.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\treectrl.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\treectrl.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\treectrl.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\treectrl.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\treectrl.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\treectrl.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\treectrl.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\treectrl.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TYPETEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\typetest.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -TYPETEST_OBJECTS = \ - $(OBJS)\typetest_typetest.obj \ - $(OBJS)\typetest_typetest.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\typetest.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\typetest.exe del $(OBJS)\typetest.exe - -if exist $(OBJS)\typetest.ilk del $(OBJS)\typetest.ilk - -if exist $(OBJS)\typetest.pdb del $(OBJS)\typetest.pdb - -$(OBJS)\typetest.exe: $(TYPETEST_OBJECTS) $(OBJS)\typetest_typetest.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\typetest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(TYPETEST_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\typetest_typetest.obj: .\typetest.cpp - $(CXX) /c /nologo /TP /Fo$@ $(TYPETEST_CXXFLAGS) .\typetest.cpp - -$(OBJS)\typetest_typetest.res: .\typetest.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\typetest.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +TYPETEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\typetest.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +TYPETEST_OBJECTS = \ + $(OBJS)\typetest_typetest.obj +TYPETEST_RESOURCES = \ + $(OBJS)\typetest_typetest.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\typetest.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\typetest.exe del $(OBJS)\typetest.exe + -if exist $(OBJS)\typetest.ilk del $(OBJS)\typetest.ilk + -if exist $(OBJS)\typetest.pdb del $(OBJS)\typetest.pdb + +$(OBJS)\typetest.exe: $(TYPETEST_OBJECTS) $(OBJS)\typetest_typetest.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\typetest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(TYPETEST_OBJECTS) $(TYPETEST_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\typetest_typetest.obj: .\typetest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TYPETEST_CXXFLAGS) .\typetest.cpp + +$(OBJS)\typetest_typetest.res: .\typetest.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\typetest.rc + diff --git a/samples/typetest/makefile.wat b/samples/typetest/makefile.wat index a6ffaedbcd..02b7799ce7 100644 --- a/samples/typetest/makefile.wat +++ b/samples/typetest/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TYPETEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -TYPETEST_OBJECTS = & - $(OBJS)\typetest_typetest.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\typetest.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\typetest.exe del $(OBJS)\typetest.exe - -$(OBJS)\typetest.exe : $(TYPETEST_OBJECTS) $(OBJS)\typetest_typetest.res - @%create $(OBJS)\typetest.lbc - @%append $(OBJS)\typetest.lbc option quiet - @%append $(OBJS)\typetest.lbc name $^@ - @%append $(OBJS)\typetest.lbc option caseexact - @%append $(OBJS)\typetest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(TYPETEST_OBJECTS)) do @%append $(OBJS)\typetest.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\typetest.lbc library %i - @%append $(OBJS)\typetest.lbc option resource=$(OBJS)\typetest_typetest.res - @for %i in () do @%append $(OBJS)\typetest.lbc option stack=%i - wlink @$(OBJS)\typetest.lbc - -$(OBJS)\typetest_typetest.obj : .AUTODEPEND .\typetest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(TYPETEST_CXXFLAGS) $< - -$(OBJS)\typetest_typetest.res : .AUTODEPEND .\typetest.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +TYPETEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +TYPETEST_OBJECTS = & + $(OBJS)\typetest_typetest.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\typetest.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\typetest.exe del $(OBJS)\typetest.exe + +$(OBJS)\typetest.exe : $(TYPETEST_OBJECTS) $(OBJS)\typetest_typetest.res + @%create $(OBJS)\typetest.lbc + @%append $(OBJS)\typetest.lbc option quiet + @%append $(OBJS)\typetest.lbc name $^@ + @%append $(OBJS)\typetest.lbc option caseexact + @%append $(OBJS)\typetest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(TYPETEST_OBJECTS)) do @%append $(OBJS)\typetest.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\typetest.lbc library %i + @%append $(OBJS)\typetest.lbc option resource=$(OBJS)\typetest_typetest.res + @for %i in () do @%append $(OBJS)\typetest.lbc option stack=%i + wlink @$(OBJS)\typetest.lbc + +$(OBJS)\typetest_typetest.obj : .AUTODEPEND .\typetest.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(TYPETEST_CXXFLAGS) $< + +$(OBJS)\typetest_typetest.res : .AUTODEPEND .\typetest.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/typetest/typetest.dsp b/samples/typetest/typetest.dsp index ae0aa70fe9..cf265712f3 100644 --- a/samples/typetest/typetest.dsp +++ b/samples/typetest/typetest.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\typetest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\typetest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\typetest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\typetest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\typetest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\typetest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\typetest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\typetest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\typetest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\typetest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\typetest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\typetest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\typetest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\typetest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\typetest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\typetest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\typetest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\typetest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\typetest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\typetest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/typetest/typetest_vc7.vcproj b/samples/typetest/typetest_vc7.vcproj index 32be8f2d8d..0409b3a8da 100644 --- a/samples/typetest/typetest_vc7.vcproj +++ b/samples/typetest/typetest_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\typetest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\typetest.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\typetest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\typetest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\typetest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\typetest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\typetest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\typetest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\typetest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\typetest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\typetest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\typetest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -VALIDATE_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\validate.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -VALIDATE_OBJECTS = \ - $(OBJS)\validate_validate.obj \ - $(OBJS)\validate_sample.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\validate.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\validate.exe del $(OBJS)\validate.exe - -if exist $(OBJS)\validate.ilk del $(OBJS)\validate.ilk - -if exist $(OBJS)\validate.pdb del $(OBJS)\validate.pdb - -$(OBJS)\validate.exe: $(VALIDATE_OBJECTS) $(OBJS)\validate_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\validate.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(VALIDATE_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\validate_validate.obj: .\validate.cpp - $(CXX) /c /nologo /TP /Fo$@ $(VALIDATE_CXXFLAGS) .\validate.cpp - -$(OBJS)\validate_sample.res: .\..\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +VALIDATE_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\validate.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +VALIDATE_OBJECTS = \ + $(OBJS)\validate_validate.obj +VALIDATE_RESOURCES = \ + $(OBJS)\validate_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\validate.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\validate.exe del $(OBJS)\validate.exe + -if exist $(OBJS)\validate.ilk del $(OBJS)\validate.ilk + -if exist $(OBJS)\validate.pdb del $(OBJS)\validate.pdb + +$(OBJS)\validate.exe: $(VALIDATE_OBJECTS) $(OBJS)\validate_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\validate.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(VALIDATE_OBJECTS) $(VALIDATE_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\validate_validate.obj: .\validate.cpp + $(CXX) /c /nologo /TP /Fo$@ $(VALIDATE_CXXFLAGS) .\validate.cpp + +$(OBJS)\validate_sample.res: .\..\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc + diff --git a/samples/validate/makefile.wat b/samples/validate/makefile.wat index aad1a247e9..16da6126e9 100644 --- a/samples/validate/makefile.wat +++ b/samples/validate/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -VALIDATE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -VALIDATE_OBJECTS = & - $(OBJS)\validate_validate.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\validate.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\validate.exe del $(OBJS)\validate.exe - -$(OBJS)\validate.exe : $(VALIDATE_OBJECTS) $(OBJS)\validate_sample.res - @%create $(OBJS)\validate.lbc - @%append $(OBJS)\validate.lbc option quiet - @%append $(OBJS)\validate.lbc name $^@ - @%append $(OBJS)\validate.lbc option caseexact - @%append $(OBJS)\validate.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(VALIDATE_OBJECTS)) do @%append $(OBJS)\validate.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\validate.lbc library %i - @%append $(OBJS)\validate.lbc option resource=$(OBJS)\validate_sample.res - @for %i in () do @%append $(OBJS)\validate.lbc option stack=%i - wlink @$(OBJS)\validate.lbc - -$(OBJS)\validate_validate.obj : .AUTODEPEND .\validate.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(VALIDATE_CXXFLAGS) $< - -$(OBJS)\validate_sample.res : .AUTODEPEND .\..\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +VALIDATE_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +VALIDATE_OBJECTS = & + $(OBJS)\validate_validate.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\validate.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\validate.exe del $(OBJS)\validate.exe + +$(OBJS)\validate.exe : $(VALIDATE_OBJECTS) $(OBJS)\validate_sample.res + @%create $(OBJS)\validate.lbc + @%append $(OBJS)\validate.lbc option quiet + @%append $(OBJS)\validate.lbc name $^@ + @%append $(OBJS)\validate.lbc option caseexact + @%append $(OBJS)\validate.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(VALIDATE_OBJECTS)) do @%append $(OBJS)\validate.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\validate.lbc library %i + @%append $(OBJS)\validate.lbc option resource=$(OBJS)\validate_sample.res + @for %i in () do @%append $(OBJS)\validate.lbc option stack=%i + wlink @$(OBJS)\validate.lbc + +$(OBJS)\validate_validate.obj : .AUTODEPEND .\validate.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(VALIDATE_CXXFLAGS) $< + +$(OBJS)\validate_sample.res : .AUTODEPEND .\..\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/validate/validate.dsp b/samples/validate/validate.dsp index 0c0ca5a8e3..d98e1fde64 100644 --- a/samples/validate/validate.dsp +++ b/samples/validate/validate.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\validate" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\validate.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\validate.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\validate.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\validate.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\validate" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\validate.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\validate.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\validate.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\validate.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\validate" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\validate.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\validate.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\validate.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\validate.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\validate" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\validate.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\validate.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\validate.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\validate.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/validate/validate_vc7.vcproj b/samples/validate/validate_vc7.vcproj index dae84c12cb..96aaaa1fde 100644 --- a/samples/validate/validate_vc7.vcproj +++ b/samples/validate/validate_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\validate.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\validate.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\validate.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\validate.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\validate.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\validate.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\validate.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\validate.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\validate.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\validate.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\validate.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\validate.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -VSTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\vstest.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -VSTEST_OBJECTS = \ - $(OBJS)\vstest_sample.res \ - $(OBJS)\vstest_vstest.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\vstest.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\vstest.exe del $(OBJS)\vstest.exe - -if exist $(OBJS)\vstest.ilk del $(OBJS)\vstest.ilk - -if exist $(OBJS)\vstest.pdb del $(OBJS)\vstest.pdb - -$(OBJS)\vstest.exe: $(VSTEST_OBJECTS) $(OBJS)\vstest_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\vstest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(VSTEST_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\vstest_sample.res: .\..\..\samples\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc - -$(OBJS)\vstest_vstest.obj: .\vstest.cpp - $(CXX) /c /nologo /TP /Fo$@ $(VSTEST_CXXFLAGS) .\vstest.cpp - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +VSTEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\vstest.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +VSTEST_OBJECTS = \ + $(OBJS)\vstest_vstest.obj +VSTEST_RESOURCES = \ + $(OBJS)\vstest_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\vstest.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\vstest.exe del $(OBJS)\vstest.exe + -if exist $(OBJS)\vstest.ilk del $(OBJS)\vstest.ilk + -if exist $(OBJS)\vstest.pdb del $(OBJS)\vstest.pdb + +$(OBJS)\vstest.exe: $(VSTEST_OBJECTS) $(OBJS)\vstest_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\vstest.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(VSTEST_OBJECTS) $(VSTEST_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\vstest_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + +$(OBJS)\vstest_vstest.obj: .\vstest.cpp + $(CXX) /c /nologo /TP /Fo$@ $(VSTEST_CXXFLAGS) .\vstest.cpp + diff --git a/samples/vscroll/makefile.wat b/samples/vscroll/makefile.wat index 9a92a348be..3d4fbeee9f 100644 --- a/samples/vscroll/makefile.wat +++ b/samples/vscroll/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -VSTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -VSTEST_OBJECTS = & - $(OBJS)\vstest_vstest.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\vstest.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\vstest.exe del $(OBJS)\vstest.exe - -$(OBJS)\vstest.exe : $(VSTEST_OBJECTS) $(OBJS)\vstest_sample.res - @%create $(OBJS)\vstest.lbc - @%append $(OBJS)\vstest.lbc option quiet - @%append $(OBJS)\vstest.lbc name $^@ - @%append $(OBJS)\vstest.lbc option caseexact - @%append $(OBJS)\vstest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(VSTEST_OBJECTS)) do @%append $(OBJS)\vstest.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\vstest.lbc library %i - @%append $(OBJS)\vstest.lbc option resource=$(OBJS)\vstest_sample.res - @for %i in () do @%append $(OBJS)\vstest.lbc option stack=%i - wlink @$(OBJS)\vstest.lbc - -$(OBJS)\vstest_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - -$(OBJS)\vstest_vstest.obj : .AUTODEPEND .\vstest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(VSTEST_CXXFLAGS) $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +VSTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +VSTEST_OBJECTS = & + $(OBJS)\vstest_vstest.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\vstest.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\vstest.exe del $(OBJS)\vstest.exe + +$(OBJS)\vstest.exe : $(VSTEST_OBJECTS) $(OBJS)\vstest_sample.res + @%create $(OBJS)\vstest.lbc + @%append $(OBJS)\vstest.lbc option quiet + @%append $(OBJS)\vstest.lbc name $^@ + @%append $(OBJS)\vstest.lbc option caseexact + @%append $(OBJS)\vstest.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(VSTEST_OBJECTS)) do @%append $(OBJS)\vstest.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\vstest.lbc library %i + @%append $(OBJS)\vstest.lbc option resource=$(OBJS)\vstest_sample.res + @for %i in () do @%append $(OBJS)\vstest.lbc option stack=%i + wlink @$(OBJS)\vstest.lbc + +$(OBJS)\vstest_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + +$(OBJS)\vstest_vstest.obj : .AUTODEPEND .\vstest.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(VSTEST_CXXFLAGS) $< + diff --git a/samples/vscroll/vscroll.dsp b/samples/vscroll/vscroll.dsp index be9b576714..5ffa94a5ff 100644 --- a/samples/vscroll/vscroll.dsp +++ b/samples/vscroll/vscroll.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\vstest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\vstest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\vstest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\vstest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\vstest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\vstest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\vstest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\vstest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\vstest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\vstest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\vstest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\vstest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\vstest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\vstest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\vstest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\vstest" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\vstest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\vstest.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\vstest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\vstest.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/vscroll/vscroll_vc7.vcproj b/samples/vscroll/vscroll_vc7.vcproj index 198986f5fb..afb2dd2762 100644 --- a/samples/vscroll/vscroll_vc7.vcproj +++ b/samples/vscroll/vscroll_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\vstest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\vstest.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\vstest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\vstest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\vstest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\vstest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\vstest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\vstest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\vstest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\vstest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\vstest.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\vstest.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WIDGETS_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\widgets.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -WIDGETS_OBJECTS = \ - $(OBJS)\widgets_bmpcombobox.obj \ - $(OBJS)\widgets_button.obj \ - $(OBJS)\widgets_checkbox.obj \ - $(OBJS)\widgets_choice.obj \ - $(OBJS)\widgets_clrpicker.obj \ - $(OBJS)\widgets_combobox.obj \ - $(OBJS)\widgets_datepick.obj \ - $(OBJS)\widgets_dirctrl.obj \ - $(OBJS)\widgets_dirpicker.obj \ - $(OBJS)\widgets_editlbox.obj \ - $(OBJS)\widgets_filectrl.obj \ - $(OBJS)\widgets_filepicker.obj \ - $(OBJS)\widgets_fontpicker.obj \ - $(OBJS)\widgets_gauge.obj \ - $(OBJS)\widgets_hyperlnk.obj \ - $(OBJS)\widgets_itemcontainer.obj \ - $(OBJS)\widgets_listbox.obj \ - $(OBJS)\widgets_notebook.obj \ - $(OBJS)\widgets_odcombobox.obj \ - $(OBJS)\widgets_radiobox.obj \ - $(OBJS)\widgets_searchctrl.obj \ - $(OBJS)\widgets_slider.obj \ - $(OBJS)\widgets_spinbtn.obj \ - $(OBJS)\widgets_static.obj \ - $(OBJS)\widgets_statbmp.obj \ - $(OBJS)\widgets_textctrl.obj \ - $(OBJS)\widgets_toggle.obj \ - $(OBJS)\widgets_widgets.obj \ - $(OBJS)\widgets_sample.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_ADV_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\widgets.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\widgets.exe del $(OBJS)\widgets.exe - -if exist $(OBJS)\widgets.ilk del $(OBJS)\widgets.ilk - -if exist $(OBJS)\widgets.pdb del $(OBJS)\widgets.pdb - -$(OBJS)\widgets.exe: $(WIDGETS_OBJECTS) $(OBJS)\widgets_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\widgets.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(WIDGETS_OBJECTS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\widgets_bmpcombobox.obj: .\bmpcombobox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\bmpcombobox.cpp - -$(OBJS)\widgets_button.obj: .\button.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\button.cpp - -$(OBJS)\widgets_checkbox.obj: .\checkbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\checkbox.cpp - -$(OBJS)\widgets_choice.obj: .\choice.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\choice.cpp - -$(OBJS)\widgets_clrpicker.obj: .\clrpicker.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\clrpicker.cpp - -$(OBJS)\widgets_combobox.obj: .\combobox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\combobox.cpp - -$(OBJS)\widgets_datepick.obj: .\datepick.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\datepick.cpp - -$(OBJS)\widgets_dirctrl.obj: .\dirctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\dirctrl.cpp - -$(OBJS)\widgets_dirpicker.obj: .\dirpicker.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\dirpicker.cpp - -$(OBJS)\widgets_editlbox.obj: .\editlbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\editlbox.cpp - -$(OBJS)\widgets_filectrl.obj: .\filectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\filectrl.cpp - -$(OBJS)\widgets_filepicker.obj: .\filepicker.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\filepicker.cpp - -$(OBJS)\widgets_fontpicker.obj: .\fontpicker.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\fontpicker.cpp - -$(OBJS)\widgets_gauge.obj: .\gauge.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\gauge.cpp - -$(OBJS)\widgets_hyperlnk.obj: .\hyperlnk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\hyperlnk.cpp - -$(OBJS)\widgets_itemcontainer.obj: .\itemcontainer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\itemcontainer.cpp - -$(OBJS)\widgets_listbox.obj: .\listbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\listbox.cpp - -$(OBJS)\widgets_notebook.obj: .\notebook.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\notebook.cpp - -$(OBJS)\widgets_odcombobox.obj: .\odcombobox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\odcombobox.cpp - -$(OBJS)\widgets_radiobox.obj: .\radiobox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\radiobox.cpp - -$(OBJS)\widgets_searchctrl.obj: .\searchctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\searchctrl.cpp - -$(OBJS)\widgets_slider.obj: .\slider.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\slider.cpp - -$(OBJS)\widgets_spinbtn.obj: .\spinbtn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\spinbtn.cpp - -$(OBJS)\widgets_static.obj: .\static.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\static.cpp - -$(OBJS)\widgets_statbmp.obj: .\statbmp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\statbmp.cpp - -$(OBJS)\widgets_textctrl.obj: .\textctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\textctrl.cpp - -$(OBJS)\widgets_toggle.obj: .\toggle.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\toggle.cpp - -$(OBJS)\widgets_widgets.obj: .\widgets.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\widgets.cpp - -$(OBJS)\widgets_sample.res: .\..\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +WIDGETS_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\widgets.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +WIDGETS_OBJECTS = \ + $(OBJS)\widgets_bmpcombobox.obj \ + $(OBJS)\widgets_button.obj \ + $(OBJS)\widgets_checkbox.obj \ + $(OBJS)\widgets_choice.obj \ + $(OBJS)\widgets_clrpicker.obj \ + $(OBJS)\widgets_combobox.obj \ + $(OBJS)\widgets_datepick.obj \ + $(OBJS)\widgets_dirctrl.obj \ + $(OBJS)\widgets_dirpicker.obj \ + $(OBJS)\widgets_editlbox.obj \ + $(OBJS)\widgets_filectrl.obj \ + $(OBJS)\widgets_filepicker.obj \ + $(OBJS)\widgets_fontpicker.obj \ + $(OBJS)\widgets_gauge.obj \ + $(OBJS)\widgets_hyperlnk.obj \ + $(OBJS)\widgets_itemcontainer.obj \ + $(OBJS)\widgets_listbox.obj \ + $(OBJS)\widgets_notebook.obj \ + $(OBJS)\widgets_odcombobox.obj \ + $(OBJS)\widgets_radiobox.obj \ + $(OBJS)\widgets_searchctrl.obj \ + $(OBJS)\widgets_slider.obj \ + $(OBJS)\widgets_spinbtn.obj \ + $(OBJS)\widgets_static.obj \ + $(OBJS)\widgets_statbmp.obj \ + $(OBJS)\widgets_textctrl.obj \ + $(OBJS)\widgets_toggle.obj \ + $(OBJS)\widgets_widgets.obj +WIDGETS_RESOURCES = \ + $(OBJS)\widgets_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_ADV_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\widgets.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\widgets.exe del $(OBJS)\widgets.exe + -if exist $(OBJS)\widgets.ilk del $(OBJS)\widgets.ilk + -if exist $(OBJS)\widgets.pdb del $(OBJS)\widgets.pdb + +$(OBJS)\widgets.exe: $(WIDGETS_OBJECTS) $(OBJS)\widgets_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\widgets.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(WIDGETS_OBJECTS) $(WIDGETS_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\widgets_bmpcombobox.obj: .\bmpcombobox.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\bmpcombobox.cpp + +$(OBJS)\widgets_button.obj: .\button.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\button.cpp + +$(OBJS)\widgets_checkbox.obj: .\checkbox.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\checkbox.cpp + +$(OBJS)\widgets_choice.obj: .\choice.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\choice.cpp + +$(OBJS)\widgets_clrpicker.obj: .\clrpicker.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\clrpicker.cpp + +$(OBJS)\widgets_combobox.obj: .\combobox.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\combobox.cpp + +$(OBJS)\widgets_datepick.obj: .\datepick.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\datepick.cpp + +$(OBJS)\widgets_dirctrl.obj: .\dirctrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\dirctrl.cpp + +$(OBJS)\widgets_dirpicker.obj: .\dirpicker.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\dirpicker.cpp + +$(OBJS)\widgets_editlbox.obj: .\editlbox.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\editlbox.cpp + +$(OBJS)\widgets_filectrl.obj: .\filectrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\filectrl.cpp + +$(OBJS)\widgets_filepicker.obj: .\filepicker.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\filepicker.cpp + +$(OBJS)\widgets_fontpicker.obj: .\fontpicker.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\fontpicker.cpp + +$(OBJS)\widgets_gauge.obj: .\gauge.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\gauge.cpp + +$(OBJS)\widgets_hyperlnk.obj: .\hyperlnk.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\hyperlnk.cpp + +$(OBJS)\widgets_itemcontainer.obj: .\itemcontainer.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\itemcontainer.cpp + +$(OBJS)\widgets_listbox.obj: .\listbox.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\listbox.cpp + +$(OBJS)\widgets_notebook.obj: .\notebook.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\notebook.cpp + +$(OBJS)\widgets_odcombobox.obj: .\odcombobox.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\odcombobox.cpp + +$(OBJS)\widgets_radiobox.obj: .\radiobox.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\radiobox.cpp + +$(OBJS)\widgets_searchctrl.obj: .\searchctrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\searchctrl.cpp + +$(OBJS)\widgets_slider.obj: .\slider.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\slider.cpp + +$(OBJS)\widgets_spinbtn.obj: .\spinbtn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\spinbtn.cpp + +$(OBJS)\widgets_static.obj: .\static.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\static.cpp + +$(OBJS)\widgets_statbmp.obj: .\statbmp.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\statbmp.cpp + +$(OBJS)\widgets_textctrl.obj: .\textctrl.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\textctrl.cpp + +$(OBJS)\widgets_toggle.obj: .\toggle.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\toggle.cpp + +$(OBJS)\widgets_widgets.obj: .\widgets.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIDGETS_CXXFLAGS) .\widgets.cpp + +$(OBJS)\widgets_sample.res: .\..\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\sample.rc + diff --git a/samples/widgets/makefile.wat b/samples/widgets/makefile.wat index d1f10cf6d8..046ef4da93 100644 --- a/samples/widgets/makefile.wat +++ b/samples/widgets/makefile.wat @@ -1,373 +1,373 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_ADV_p = -!ifeq MONOLITHIC 0 -__WXLIB_ADV_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WIDGETS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -WIDGETS_OBJECTS = & - $(OBJS)\widgets_bmpcombobox.obj & - $(OBJS)\widgets_button.obj & - $(OBJS)\widgets_checkbox.obj & - $(OBJS)\widgets_choice.obj & - $(OBJS)\widgets_clrpicker.obj & - $(OBJS)\widgets_combobox.obj & - $(OBJS)\widgets_datepick.obj & - $(OBJS)\widgets_dirctrl.obj & - $(OBJS)\widgets_dirpicker.obj & - $(OBJS)\widgets_editlbox.obj & - $(OBJS)\widgets_filectrl.obj & - $(OBJS)\widgets_filepicker.obj & - $(OBJS)\widgets_fontpicker.obj & - $(OBJS)\widgets_gauge.obj & - $(OBJS)\widgets_hyperlnk.obj & - $(OBJS)\widgets_itemcontainer.obj & - $(OBJS)\widgets_listbox.obj & - $(OBJS)\widgets_notebook.obj & - $(OBJS)\widgets_odcombobox.obj & - $(OBJS)\widgets_radiobox.obj & - $(OBJS)\widgets_searchctrl.obj & - $(OBJS)\widgets_slider.obj & - $(OBJS)\widgets_spinbtn.obj & - $(OBJS)\widgets_static.obj & - $(OBJS)\widgets_statbmp.obj & - $(OBJS)\widgets_textctrl.obj & - $(OBJS)\widgets_toggle.obj & - $(OBJS)\widgets_widgets.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\widgets.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\widgets.exe del $(OBJS)\widgets.exe - -$(OBJS)\widgets.exe : $(WIDGETS_OBJECTS) $(OBJS)\widgets_sample.res - @%create $(OBJS)\widgets.lbc - @%append $(OBJS)\widgets.lbc option quiet - @%append $(OBJS)\widgets.lbc name $^@ - @%append $(OBJS)\widgets.lbc option caseexact - @%append $(OBJS)\widgets.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(WIDGETS_OBJECTS)) do @%append $(OBJS)\widgets.lbc file %i - @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\widgets.lbc library %i - @%append $(OBJS)\widgets.lbc option resource=$(OBJS)\widgets_sample.res - @for %i in () do @%append $(OBJS)\widgets.lbc option stack=%i - wlink @$(OBJS)\widgets.lbc - -$(OBJS)\widgets_bmpcombobox.obj : .AUTODEPEND .\bmpcombobox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< - -$(OBJS)\widgets_button.obj : .AUTODEPEND .\button.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< - -$(OBJS)\widgets_checkbox.obj : .AUTODEPEND .\checkbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< - -$(OBJS)\widgets_choice.obj : .AUTODEPEND .\choice.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< - -$(OBJS)\widgets_clrpicker.obj : .AUTODEPEND .\clrpicker.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< - -$(OBJS)\widgets_combobox.obj : .AUTODEPEND .\combobox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< - -$(OBJS)\widgets_datepick.obj : .AUTODEPEND .\datepick.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< - -$(OBJS)\widgets_dirctrl.obj : .AUTODEPEND .\dirctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< - -$(OBJS)\widgets_dirpicker.obj : .AUTODEPEND .\dirpicker.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< - -$(OBJS)\widgets_editlbox.obj : .AUTODEPEND .\editlbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< - -$(OBJS)\widgets_filectrl.obj : .AUTODEPEND .\filectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< - -$(OBJS)\widgets_filepicker.obj : .AUTODEPEND .\filepicker.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< - -$(OBJS)\widgets_fontpicker.obj : .AUTODEPEND .\fontpicker.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< - -$(OBJS)\widgets_gauge.obj : .AUTODEPEND .\gauge.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< - -$(OBJS)\widgets_hyperlnk.obj : .AUTODEPEND .\hyperlnk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< - -$(OBJS)\widgets_itemcontainer.obj : .AUTODEPEND .\itemcontainer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< - -$(OBJS)\widgets_listbox.obj : .AUTODEPEND .\listbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< - -$(OBJS)\widgets_notebook.obj : .AUTODEPEND .\notebook.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< - -$(OBJS)\widgets_odcombobox.obj : .AUTODEPEND .\odcombobox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< - -$(OBJS)\widgets_radiobox.obj : .AUTODEPEND .\radiobox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< - -$(OBJS)\widgets_searchctrl.obj : .AUTODEPEND .\searchctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< - -$(OBJS)\widgets_slider.obj : .AUTODEPEND .\slider.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< - -$(OBJS)\widgets_spinbtn.obj : .AUTODEPEND .\spinbtn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< - -$(OBJS)\widgets_static.obj : .AUTODEPEND .\static.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< - -$(OBJS)\widgets_statbmp.obj : .AUTODEPEND .\statbmp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< - -$(OBJS)\widgets_textctrl.obj : .AUTODEPEND .\textctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< - -$(OBJS)\widgets_toggle.obj : .AUTODEPEND .\toggle.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< - -$(OBJS)\widgets_widgets.obj : .AUTODEPEND .\widgets.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< - -$(OBJS)\widgets_sample.res : .AUTODEPEND .\..\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +WIDGETS_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +WIDGETS_OBJECTS = & + $(OBJS)\widgets_bmpcombobox.obj & + $(OBJS)\widgets_button.obj & + $(OBJS)\widgets_checkbox.obj & + $(OBJS)\widgets_choice.obj & + $(OBJS)\widgets_clrpicker.obj & + $(OBJS)\widgets_combobox.obj & + $(OBJS)\widgets_datepick.obj & + $(OBJS)\widgets_dirctrl.obj & + $(OBJS)\widgets_dirpicker.obj & + $(OBJS)\widgets_editlbox.obj & + $(OBJS)\widgets_filectrl.obj & + $(OBJS)\widgets_filepicker.obj & + $(OBJS)\widgets_fontpicker.obj & + $(OBJS)\widgets_gauge.obj & + $(OBJS)\widgets_hyperlnk.obj & + $(OBJS)\widgets_itemcontainer.obj & + $(OBJS)\widgets_listbox.obj & + $(OBJS)\widgets_notebook.obj & + $(OBJS)\widgets_odcombobox.obj & + $(OBJS)\widgets_radiobox.obj & + $(OBJS)\widgets_searchctrl.obj & + $(OBJS)\widgets_slider.obj & + $(OBJS)\widgets_spinbtn.obj & + $(OBJS)\widgets_static.obj & + $(OBJS)\widgets_statbmp.obj & + $(OBJS)\widgets_textctrl.obj & + $(OBJS)\widgets_toggle.obj & + $(OBJS)\widgets_widgets.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\widgets.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\widgets.exe del $(OBJS)\widgets.exe + +$(OBJS)\widgets.exe : $(WIDGETS_OBJECTS) $(OBJS)\widgets_sample.res + @%create $(OBJS)\widgets.lbc + @%append $(OBJS)\widgets.lbc option quiet + @%append $(OBJS)\widgets.lbc name $^@ + @%append $(OBJS)\widgets.lbc option caseexact + @%append $(OBJS)\widgets.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(WIDGETS_OBJECTS)) do @%append $(OBJS)\widgets.lbc file %i + @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\widgets.lbc library %i + @%append $(OBJS)\widgets.lbc option resource=$(OBJS)\widgets_sample.res + @for %i in () do @%append $(OBJS)\widgets.lbc option stack=%i + wlink @$(OBJS)\widgets.lbc + +$(OBJS)\widgets_bmpcombobox.obj : .AUTODEPEND .\bmpcombobox.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_button.obj : .AUTODEPEND .\button.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_checkbox.obj : .AUTODEPEND .\checkbox.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_choice.obj : .AUTODEPEND .\choice.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_clrpicker.obj : .AUTODEPEND .\clrpicker.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_combobox.obj : .AUTODEPEND .\combobox.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_datepick.obj : .AUTODEPEND .\datepick.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_dirctrl.obj : .AUTODEPEND .\dirctrl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_dirpicker.obj : .AUTODEPEND .\dirpicker.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_editlbox.obj : .AUTODEPEND .\editlbox.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_filectrl.obj : .AUTODEPEND .\filectrl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_filepicker.obj : .AUTODEPEND .\filepicker.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_fontpicker.obj : .AUTODEPEND .\fontpicker.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_gauge.obj : .AUTODEPEND .\gauge.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_hyperlnk.obj : .AUTODEPEND .\hyperlnk.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_itemcontainer.obj : .AUTODEPEND .\itemcontainer.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_listbox.obj : .AUTODEPEND .\listbox.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_notebook.obj : .AUTODEPEND .\notebook.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_odcombobox.obj : .AUTODEPEND .\odcombobox.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_radiobox.obj : .AUTODEPEND .\radiobox.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_searchctrl.obj : .AUTODEPEND .\searchctrl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_slider.obj : .AUTODEPEND .\slider.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_spinbtn.obj : .AUTODEPEND .\spinbtn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_static.obj : .AUTODEPEND .\static.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_statbmp.obj : .AUTODEPEND .\statbmp.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_textctrl.obj : .AUTODEPEND .\textctrl.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_toggle.obj : .AUTODEPEND .\toggle.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_widgets.obj : .AUTODEPEND .\widgets.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIDGETS_CXXFLAGS) $< + +$(OBJS)\widgets_sample.res : .AUTODEPEND .\..\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/widgets/widgets.dsp b/samples/widgets/widgets.dsp index 3ceea3a163..a2497c3ee3 100644 --- a/samples/widgets/widgets.dsp +++ b/samples/widgets/widgets.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\widgets" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\widgets.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\widgets.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\widgets.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\widgets.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\widgets" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\widgets.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\widgets.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\widgets.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\widgets.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\widgets" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\widgets.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\widgets.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\widgets.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\widgets.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\widgets" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\widgets.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\widgets.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\widgets.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\widgets.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/widgets/widgets_vc7.vcproj b/samples/widgets/widgets_vc7.vcproj index f331c5f67b..e053d9c3b1 100644 --- a/samples/widgets/widgets_vc7.vcproj +++ b/samples/widgets/widgets_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\widgets.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\widgets.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\widgets.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\widgets.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\widgets.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\widgets.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\widgets.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\widgets.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\widgets.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\widgets.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\widgets.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\widgets.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WIZARD_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\wizard.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -WIZARD_OBJECTS = \ - $(OBJS)\wizard_wizard.obj \ - $(OBJS)\wizard_wizard.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_ADV_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\wizard.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\wizard.exe del $(OBJS)\wizard.exe - -if exist $(OBJS)\wizard.ilk del $(OBJS)\wizard.ilk - -if exist $(OBJS)\wizard.pdb del $(OBJS)\wizard.pdb - -$(OBJS)\wizard.exe: $(WIZARD_OBJECTS) $(OBJS)\wizard_wizard.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wizard.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(WIZARD_OBJECTS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\wizard_wizard.obj: .\wizard.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WIZARD_CXXFLAGS) .\wizard.cpp - -$(OBJS)\wizard_wizard.res: .\wizard.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\wizard.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +WIZARD_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\wizard.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +WIZARD_OBJECTS = \ + $(OBJS)\wizard_wizard.obj +WIZARD_RESOURCES = \ + $(OBJS)\wizard_wizard.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_ADV_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\wizard.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\wizard.exe del $(OBJS)\wizard.exe + -if exist $(OBJS)\wizard.ilk del $(OBJS)\wizard.ilk + -if exist $(OBJS)\wizard.pdb del $(OBJS)\wizard.pdb + +$(OBJS)\wizard.exe: $(WIZARD_OBJECTS) $(OBJS)\wizard_wizard.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wizard.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(WIZARD_OBJECTS) $(WIZARD_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\wizard_wizard.obj: .\wizard.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WIZARD_CXXFLAGS) .\wizard.cpp + +$(OBJS)\wizard_wizard.res: .\wizard.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\wizard.rc + diff --git a/samples/wizard/makefile.wat b/samples/wizard/makefile.wat index 546da38a7b..5833db4989 100644 --- a/samples/wizard/makefile.wat +++ b/samples/wizard/makefile.wat @@ -1,265 +1,265 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_ADV_p = -!ifeq MONOLITHIC 0 -__WXLIB_ADV_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WIZARD_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -WIZARD_OBJECTS = & - $(OBJS)\wizard_wizard.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\wizard.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\wizard.exe del $(OBJS)\wizard.exe - -$(OBJS)\wizard.exe : $(WIZARD_OBJECTS) $(OBJS)\wizard_wizard.res - @%create $(OBJS)\wizard.lbc - @%append $(OBJS)\wizard.lbc option quiet - @%append $(OBJS)\wizard.lbc name $^@ - @%append $(OBJS)\wizard.lbc option caseexact - @%append $(OBJS)\wizard.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(WIZARD_OBJECTS)) do @%append $(OBJS)\wizard.lbc file %i - @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\wizard.lbc library %i - @%append $(OBJS)\wizard.lbc option resource=$(OBJS)\wizard_wizard.res - @for %i in () do @%append $(OBJS)\wizard.lbc option stack=%i - wlink @$(OBJS)\wizard.lbc - -$(OBJS)\wizard_wizard.obj : .AUTODEPEND .\wizard.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WIZARD_CXXFLAGS) $< - -$(OBJS)\wizard_wizard.res : .AUTODEPEND .\wizard.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +WIZARD_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +WIZARD_OBJECTS = & + $(OBJS)\wizard_wizard.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\wizard.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\wizard.exe del $(OBJS)\wizard.exe + +$(OBJS)\wizard.exe : $(WIZARD_OBJECTS) $(OBJS)\wizard_wizard.res + @%create $(OBJS)\wizard.lbc + @%append $(OBJS)\wizard.lbc option quiet + @%append $(OBJS)\wizard.lbc name $^@ + @%append $(OBJS)\wizard.lbc option caseexact + @%append $(OBJS)\wizard.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(WIZARD_OBJECTS)) do @%append $(OBJS)\wizard.lbc file %i + @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\wizard.lbc library %i + @%append $(OBJS)\wizard.lbc option resource=$(OBJS)\wizard_wizard.res + @for %i in () do @%append $(OBJS)\wizard.lbc option stack=%i + wlink @$(OBJS)\wizard.lbc + +$(OBJS)\wizard_wizard.obj : .AUTODEPEND .\wizard.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WIZARD_CXXFLAGS) $< + +$(OBJS)\wizard_wizard.res : .AUTODEPEND .\wizard.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/wizard/wizard.dsp b/samples/wizard/wizard.dsp index bfe1cad1d5..69b534b724 100644 --- a/samples/wizard/wizard.dsp +++ b/samples/wizard/wizard.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\wizard" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wizard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wizard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wizard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wizard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\wizard" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wizard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wizard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wizard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wizard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\wizard" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wizard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wizard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wizard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wizard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\wizard" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\wizard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\wizard.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\wizard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\wizard.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/wizard/wizard_vc7.vcproj b/samples/wizard/wizard_vc7.vcproj index 941d1b2b6c..1e176a3317 100644 --- a/samples/wizard/wizard_vc7.vcproj +++ b/samples/wizard/wizard_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\wizard.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\wizard.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\wizard.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\wizard.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\wizard.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\wizard.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\wizard.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\wizard.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\wizard.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\wizard.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\wizard.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\wizard.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WRAPSIZER_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\wrapsizer.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -WRAPSIZER_OBJECTS = \ - $(OBJS)\wrapsizer_sample.res \ - $(OBJS)\wrapsizer_wrapsizer.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\wrapsizer.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\wrapsizer.exe del $(OBJS)\wrapsizer.exe - -if exist $(OBJS)\wrapsizer.ilk del $(OBJS)\wrapsizer.ilk - -if exist $(OBJS)\wrapsizer.pdb del $(OBJS)\wrapsizer.pdb - -$(OBJS)\wrapsizer.exe: $(WRAPSIZER_OBJECTS) $(OBJS)\wrapsizer_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wrapsizer.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(WRAPSIZER_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\wrapsizer_sample.res: .\..\..\samples\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc - -$(OBJS)\wrapsizer_wrapsizer.obj: .\wrapsizer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WRAPSIZER_CXXFLAGS) .\wrapsizer.cpp - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +WRAPSIZER_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\wrapsizer.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +WRAPSIZER_OBJECTS = \ + $(OBJS)\wrapsizer_wrapsizer.obj +WRAPSIZER_RESOURCES = \ + $(OBJS)\wrapsizer_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\wrapsizer.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\wrapsizer.exe del $(OBJS)\wrapsizer.exe + -if exist $(OBJS)\wrapsizer.ilk del $(OBJS)\wrapsizer.ilk + -if exist $(OBJS)\wrapsizer.pdb del $(OBJS)\wrapsizer.pdb + +$(OBJS)\wrapsizer.exe: $(WRAPSIZER_OBJECTS) $(OBJS)\wrapsizer_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wrapsizer.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(WRAPSIZER_OBJECTS) $(WRAPSIZER_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\wrapsizer_sample.res: .\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc + +$(OBJS)\wrapsizer_wrapsizer.obj: .\wrapsizer.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WRAPSIZER_CXXFLAGS) .\wrapsizer.cpp + diff --git a/samples/wrapsizer/makefile.wat b/samples/wrapsizer/makefile.wat index 0792a956f9..d87f7a59e3 100644 --- a/samples/wrapsizer/makefile.wat +++ b/samples/wrapsizer/makefile.wat @@ -1,260 +1,260 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WRAPSIZER_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -WRAPSIZER_OBJECTS = & - $(OBJS)\wrapsizer_wrapsizer.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\wrapsizer.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\wrapsizer.exe del $(OBJS)\wrapsizer.exe - -$(OBJS)\wrapsizer.exe : $(WRAPSIZER_OBJECTS) $(OBJS)\wrapsizer_sample.res - @%create $(OBJS)\wrapsizer.lbc - @%append $(OBJS)\wrapsizer.lbc option quiet - @%append $(OBJS)\wrapsizer.lbc name $^@ - @%append $(OBJS)\wrapsizer.lbc option caseexact - @%append $(OBJS)\wrapsizer.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(WRAPSIZER_OBJECTS)) do @%append $(OBJS)\wrapsizer.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\wrapsizer.lbc library %i - @%append $(OBJS)\wrapsizer.lbc option resource=$(OBJS)\wrapsizer_sample.res - @for %i in () do @%append $(OBJS)\wrapsizer.lbc option stack=%i - wlink @$(OBJS)\wrapsizer.lbc - -$(OBJS)\wrapsizer_sample.res : .AUTODEPEND .\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - -$(OBJS)\wrapsizer_wrapsizer.obj : .AUTODEPEND .\wrapsizer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WRAPSIZER_CXXFLAGS) $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +WRAPSIZER_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +WRAPSIZER_OBJECTS = & + $(OBJS)\wrapsizer_wrapsizer.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\wrapsizer.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\wrapsizer.exe del $(OBJS)\wrapsizer.exe + +$(OBJS)\wrapsizer.exe : $(WRAPSIZER_OBJECTS) $(OBJS)\wrapsizer_sample.res + @%create $(OBJS)\wrapsizer.lbc + @%append $(OBJS)\wrapsizer.lbc option quiet + @%append $(OBJS)\wrapsizer.lbc name $^@ + @%append $(OBJS)\wrapsizer.lbc option caseexact + @%append $(OBJS)\wrapsizer.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(WRAPSIZER_OBJECTS)) do @%append $(OBJS)\wrapsizer.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\wrapsizer.lbc library %i + @%append $(OBJS)\wrapsizer.lbc option resource=$(OBJS)\wrapsizer_sample.res + @for %i in () do @%append $(OBJS)\wrapsizer.lbc option stack=%i + wlink @$(OBJS)\wrapsizer.lbc + +$(OBJS)\wrapsizer_sample.res : .AUTODEPEND .\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + +$(OBJS)\wrapsizer_wrapsizer.obj : .AUTODEPEND .\wrapsizer.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WRAPSIZER_CXXFLAGS) $< + diff --git a/samples/wrapsizer/wrapsizer.dsp b/samples/wrapsizer/wrapsizer.dsp index a2629eca28..4b94bc876a 100644 --- a/samples/wrapsizer/wrapsizer.dsp +++ b/samples/wrapsizer/wrapsizer.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\wrapsizer" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wrapsizer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wrapsizer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wrapsizer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wrapsizer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\wrapsizer" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wrapsizer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wrapsizer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wrapsizer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wrapsizer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\wrapsizer" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wrapsizer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wrapsizer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wrapsizer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wrapsizer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\wrapsizer" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\wrapsizer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\wrapsizer.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\wrapsizer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\wrapsizer.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/wrapsizer/wrapsizer_vc7.vcproj b/samples/wrapsizer/wrapsizer_vc7.vcproj index d8368f2dd5..a233a84f30 100644 --- a/samples/wrapsizer/wrapsizer_vc7.vcproj +++ b/samples/wrapsizer/wrapsizer_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\wrapsizer.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\wrapsizer.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\wrapsizer.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\wrapsizer.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\wrapsizer.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\wrapsizer.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\wrapsizer.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\wrapsizer.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\wrapsizer.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\wrapsizer.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\wrapsizer.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\wrapsizer.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -XRCDEMO_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\xrcdemo.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -XRCDEMO_OBJECTS = \ - $(OBJS)\xrcdemo_xrcdemo.obj \ - $(OBJS)\xrcdemo_myframe.obj \ - $(OBJS)\xrcdemo_derivdlg.obj \ - $(OBJS)\xrcdemo_custclas.obj \ - $(OBJS)\xrcdemo_xrcdemo.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_XRC_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_HTML_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_ADV_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_XML_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\xrcdemo.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe - -if exist $(OBJS)\xrcdemo.ilk del $(OBJS)\xrcdemo.ilk - -if exist $(OBJS)\xrcdemo.pdb del $(OBJS)\xrcdemo.pdb - -$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\xrcdemo.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(XRCDEMO_OBJECTS) $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -data: - if not exist $(OBJS)\rc mkdir $(OBJS)\rc - for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc - -$(OBJS)\xrcdemo_xrcdemo.obj: .\xrcdemo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) .\xrcdemo.cpp - -$(OBJS)\xrcdemo_myframe.obj: .\myframe.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) .\myframe.cpp - -$(OBJS)\xrcdemo_derivdlg.obj: .\derivdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) .\derivdlg.cpp - -$(OBJS)\xrcdemo_custclas.obj: .\custclas.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) .\custclas.cpp - -$(OBJS)\xrcdemo_xrcdemo.res: .\xrcdemo.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\xrcdemo.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +XRCDEMO_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\xrcdemo.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +XRCDEMO_OBJECTS = \ + $(OBJS)\xrcdemo_xrcdemo.obj \ + $(OBJS)\xrcdemo_myframe.obj \ + $(OBJS)\xrcdemo_derivdlg.obj \ + $(OBJS)\xrcdemo_custclas.obj +XRCDEMO_RESOURCES = \ + $(OBJS)\xrcdemo_xrcdemo.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_XRC_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_ADV_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_XML_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\xrcdemo.exe data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe + -if exist $(OBJS)\xrcdemo.ilk del $(OBJS)\xrcdemo.ilk + -if exist $(OBJS)\xrcdemo.pdb del $(OBJS)\xrcdemo.pdb + +$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\xrcdemo.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(XRCDEMO_OBJECTS) $(XRCDEMO_RESOURCES) $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +data: + if not exist $(OBJS)\rc mkdir $(OBJS)\rc + for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc + +$(OBJS)\xrcdemo_xrcdemo.obj: .\xrcdemo.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) .\xrcdemo.cpp + +$(OBJS)\xrcdemo_myframe.obj: .\myframe.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) .\myframe.cpp + +$(OBJS)\xrcdemo_derivdlg.obj: .\derivdlg.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) .\derivdlg.cpp + +$(OBJS)\xrcdemo_custclas.obj: .\custclas.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDEMO_CXXFLAGS) .\custclas.cpp + +$(OBJS)\xrcdemo_xrcdemo.res: .\xrcdemo.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\xrcdemo.rc + diff --git a/samples/xrc/makefile.wat b/samples/xrc/makefile.wat index a9d7ec4d2f..6204586a9d 100644 --- a/samples/xrc/makefile.wat +++ b/samples/xrc/makefile.wat @@ -1,296 +1,296 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_XRC_p = -!ifeq MONOLITHIC 0 -__WXLIB_XRC_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib -!endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_ADV_p = -!ifeq MONOLITHIC 0 -__WXLIB_ADV_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_XML_p = -!ifeq MONOLITHIC 0 -__WXLIB_XML_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -XRCDEMO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -XRCDEMO_OBJECTS = & - $(OBJS)\xrcdemo_xrcdemo.obj & - $(OBJS)\xrcdemo_myframe.obj & - $(OBJS)\xrcdemo_derivdlg.obj & - $(OBJS)\xrcdemo_custclas.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\xrcdemo.exe data - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe - -$(OBJS)\xrcdemo.exe : $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res - @%create $(OBJS)\xrcdemo.lbc - @%append $(OBJS)\xrcdemo.lbc option quiet - @%append $(OBJS)\xrcdemo.lbc name $^@ - @%append $(OBJS)\xrcdemo.lbc option caseexact - @%append $(OBJS)\xrcdemo.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(XRCDEMO_OBJECTS)) do @%append $(OBJS)\xrcdemo.lbc file %i - @for %i in ( $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\xrcdemo.lbc library %i - @%append $(OBJS)\xrcdemo.lbc option resource=$(OBJS)\xrcdemo_xrcdemo.res - @for %i in () do @%append $(OBJS)\xrcdemo.lbc option stack=%i - wlink @$(OBJS)\xrcdemo.lbc - -data : .SYMBOLIC - if not exist $(OBJS)\rc mkdir $(OBJS)\rc - for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc - -$(OBJS)\xrcdemo_xrcdemo.obj : .AUTODEPEND .\xrcdemo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $< - -$(OBJS)\xrcdemo_myframe.obj : .AUTODEPEND .\myframe.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $< - -$(OBJS)\xrcdemo_derivdlg.obj : .AUTODEPEND .\derivdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $< - -$(OBJS)\xrcdemo_custclas.obj : .AUTODEPEND .\custclas.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $< - -$(OBJS)\xrcdemo_xrcdemo.res : .AUTODEPEND .\xrcdemo.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_XRC_p = +!ifeq MONOLITHIC 0 +__WXLIB_XRC_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib +!endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_XML_p = +!ifeq MONOLITHIC 0 +__WXLIB_XML_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +XRCDEMO_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +XRCDEMO_OBJECTS = & + $(OBJS)\xrcdemo_xrcdemo.obj & + $(OBJS)\xrcdemo_myframe.obj & + $(OBJS)\xrcdemo_derivdlg.obj & + $(OBJS)\xrcdemo_custclas.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\xrcdemo.exe data + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe + +$(OBJS)\xrcdemo.exe : $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo.res + @%create $(OBJS)\xrcdemo.lbc + @%append $(OBJS)\xrcdemo.lbc option quiet + @%append $(OBJS)\xrcdemo.lbc name $^@ + @%append $(OBJS)\xrcdemo.lbc option caseexact + @%append $(OBJS)\xrcdemo.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(XRCDEMO_OBJECTS)) do @%append $(OBJS)\xrcdemo.lbc file %i + @for %i in ( $(__WXLIB_XRC_p) $(__WXLIB_HTML_p) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\xrcdemo.lbc library %i + @%append $(OBJS)\xrcdemo.lbc option resource=$(OBJS)\xrcdemo_xrcdemo.res + @for %i in () do @%append $(OBJS)\xrcdemo.lbc option stack=%i + wlink @$(OBJS)\xrcdemo.lbc + +data : .SYMBOLIC + if not exist $(OBJS)\rc mkdir $(OBJS)\rc + for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc + +$(OBJS)\xrcdemo_xrcdemo.obj : .AUTODEPEND .\xrcdemo.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $< + +$(OBJS)\xrcdemo_myframe.obj : .AUTODEPEND .\myframe.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $< + +$(OBJS)\xrcdemo_derivdlg.obj : .AUTODEPEND .\derivdlg.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $< + +$(OBJS)\xrcdemo_custclas.obj : .AUTODEPEND .\custclas.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(XRCDEMO_CXXFLAGS) $< + +$(OBJS)\xrcdemo_xrcdemo.res : .AUTODEPEND .\xrcdemo.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/samples/xrc/xrcdemo.dsp b/samples/xrc/xrcdemo.dsp index 16dc181ca4..677b087160 100644 --- a/samples/xrc/xrcdemo.dsp +++ b/samples/xrc/xrcdemo.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\xrcdemo" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\xrcdemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\xrcdemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\xrcdemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\xrcdemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\xrcdemo" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\xrcdemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\xrcdemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\xrcdemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\xrcdemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\xrcdemo" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\xrcdemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\xrcdemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\xrcdemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\xrcdemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\xrcdemo" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\xrcdemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\xrcdemo.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\xrcdemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\xrcdemo.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/samples/xrc/xrcdemo_vc7.vcproj b/samples/xrc/xrcdemo_vc7.vcproj index b6d66f4e12..323f2f8036 100644 --- a/samples/xrc/xrcdemo_vc7.vcproj +++ b/samples/xrc/xrcdemo_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_xrc.lib wxmsw29u_html.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u_xml.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\xrcdemo.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\xrcdemo.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_xrc.lib wxmsw29u_html.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u_xml.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\xrcdemo.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\xrcdemo.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_xrc.lib wxmsw29u_html.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u_xml.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\xrcdemo.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\xrcdemo.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_xrc.lib wxmswuniv29u_html.lib wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u_xml.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\xrcdemo.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\xrcdemo.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_xrc.lib wxmsw29u_html.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u_xml.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\xrcdemo.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\xrcdemo.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_xrc.lib wxmswuniv29u_html.lib wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u_xml.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\xrcdemo.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\xrcdemo.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\bench.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\bench.pdb" SubSystem="1" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\bench.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\bench.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\bench.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\bench.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\bench.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\bench.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\bench.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\bench.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\bench.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\bench.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -BENCH_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\bench.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) \ - $(CXXFLAGS) -BENCH_OBJECTS = \ - $(OBJS)\bench_bench.obj \ - $(OBJS)\bench_htmlpars.obj \ - $(OBJS)\bench_htmltag.obj \ - $(OBJS)\bench_ipcclient.obj \ - $(OBJS)\bench_mbconv.obj \ - $(OBJS)\bench_strings.obj \ - $(OBJS)\bench_tls.obj \ - $(OBJS)\bench_printfbench.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_NET_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\bench.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\bench.exe del $(OBJS)\bench.exe - -if exist $(OBJS)\bench.ilk del $(OBJS)\bench.ilk - -if exist $(OBJS)\bench.pdb del $(OBJS)\bench.pdb - -$(OBJS)\bench.exe: $(BENCH_OBJECTS) - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\bench.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< - $(BENCH_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (htmltest.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\bench_bench.obj: .\bench.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\bench.cpp - -$(OBJS)\bench_htmlpars.obj: .\htmlparser\htmlpars.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\htmlparser\htmlpars.cpp - -$(OBJS)\bench_htmltag.obj: .\htmlparser\htmltag.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\htmlparser\htmltag.cpp - -$(OBJS)\bench_ipcclient.obj: .\ipcclient.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\ipcclient.cpp - -$(OBJS)\bench_mbconv.obj: .\mbconv.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\mbconv.cpp - -$(OBJS)\bench_strings.obj: .\strings.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\strings.cpp - -$(OBJS)\bench_tls.obj: .\tls.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\tls.cpp - -$(OBJS)\bench_printfbench.obj: .\printfbench.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\printfbench.cpp - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +BENCH_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\bench.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +BENCH_OBJECTS = \ + $(OBJS)\bench_bench.obj \ + $(OBJS)\bench_htmlpars.obj \ + $(OBJS)\bench_htmltag.obj \ + $(OBJS)\bench_ipcclient.obj \ + $(OBJS)\bench_mbconv.obj \ + $(OBJS)\bench_strings.obj \ + $(OBJS)\bench_tls.obj \ + $(OBJS)\bench_printfbench.obj + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_NET_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\bench.exe data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\bench.exe del $(OBJS)\bench.exe + -if exist $(OBJS)\bench.ilk del $(OBJS)\bench.ilk + -if exist $(OBJS)\bench.pdb del $(OBJS)\bench.pdb + +$(OBJS)\bench.exe: $(BENCH_OBJECTS) + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\bench.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< + $(BENCH_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (htmltest.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\bench_bench.obj: .\bench.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\bench.cpp + +$(OBJS)\bench_htmlpars.obj: .\htmlparser\htmlpars.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\htmlparser\htmlpars.cpp + +$(OBJS)\bench_htmltag.obj: .\htmlparser\htmltag.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\htmlparser\htmltag.cpp + +$(OBJS)\bench_ipcclient.obj: .\ipcclient.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\ipcclient.cpp + +$(OBJS)\bench_mbconv.obj: .\mbconv.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\mbconv.cpp + +$(OBJS)\bench_strings.obj: .\strings.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\strings.cpp + +$(OBJS)\bench_tls.obj: .\tls.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\tls.cpp + +$(OBJS)\bench_printfbench.obj: .\printfbench.cpp + $(CXX) /c /nologo /TP /Fo$@ $(BENCH_CXXFLAGS) .\printfbench.cpp + diff --git a/tests/benchmarks/makefile.wat b/tests/benchmarks/makefile.wat index da5d60d15a..5e673e09da 100644 --- a/tests/benchmarks/makefile.wat +++ b/tests/benchmarks/makefile.wat @@ -1,276 +1,276 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif -__WXLIB_NET_p = -!ifeq MONOLITHIC 0 -__WXLIB_NET_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -BENCH_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -dwxUSE_GUI=0 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) -BENCH_OBJECTS = & - $(OBJS)\bench_bench.obj & - $(OBJS)\bench_htmlpars.obj & - $(OBJS)\bench_htmltag.obj & - $(OBJS)\bench_ipcclient.obj & - $(OBJS)\bench_mbconv.obj & - $(OBJS)\bench_strings.obj & - $(OBJS)\bench_tls.obj & - $(OBJS)\bench_printfbench.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\bench.exe data - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\bench.exe del $(OBJS)\bench.exe - -$(OBJS)\bench.exe : $(BENCH_OBJECTS) - @%create $(OBJS)\bench.lbc - @%append $(OBJS)\bench.lbc option quiet - @%append $(OBJS)\bench.lbc name $^@ - @%append $(OBJS)\bench.lbc option caseexact - @%append $(OBJS)\bench.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) - @for %i in ($(BENCH_OBJECTS)) do @%append $(OBJS)\bench.lbc file %i - @for %i in ( $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\bench.lbc library %i - @%append $(OBJS)\bench.lbc - @for %i in () do @%append $(OBJS)\bench.lbc option stack=%i - wlink @$(OBJS)\bench.lbc - -data : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (htmltest.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\bench_bench.obj : .AUTODEPEND .\bench.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $< - -$(OBJS)\bench_htmlpars.obj : .AUTODEPEND .\htmlparser\htmlpars.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $< - -$(OBJS)\bench_htmltag.obj : .AUTODEPEND .\htmlparser\htmltag.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $< - -$(OBJS)\bench_ipcclient.obj : .AUTODEPEND .\ipcclient.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $< - -$(OBJS)\bench_mbconv.obj : .AUTODEPEND .\mbconv.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $< - -$(OBJS)\bench_strings.obj : .AUTODEPEND .\strings.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $< - -$(OBJS)\bench_tls.obj : .AUTODEPEND .\tls.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $< - -$(OBJS)\bench_printfbench.obj : .AUTODEPEND .\printfbench.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__WXLIB_NET_p = +!ifeq MONOLITHIC 0 +__WXLIB_NET_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +BENCH_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -dwxUSE_GUI=0 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) +BENCH_OBJECTS = & + $(OBJS)\bench_bench.obj & + $(OBJS)\bench_htmlpars.obj & + $(OBJS)\bench_htmltag.obj & + $(OBJS)\bench_ipcclient.obj & + $(OBJS)\bench_mbconv.obj & + $(OBJS)\bench_strings.obj & + $(OBJS)\bench_tls.obj & + $(OBJS)\bench_printfbench.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\bench.exe data + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\bench.exe del $(OBJS)\bench.exe + +$(OBJS)\bench.exe : $(BENCH_OBJECTS) + @%create $(OBJS)\bench.lbc + @%append $(OBJS)\bench.lbc option quiet + @%append $(OBJS)\bench.lbc name $^@ + @%append $(OBJS)\bench.lbc option caseexact + @%append $(OBJS)\bench.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) + @for %i in ($(BENCH_OBJECTS)) do @%append $(OBJS)\bench.lbc file %i + @for %i in ( $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\bench.lbc library %i + @%append $(OBJS)\bench.lbc + @for %i in () do @%append $(OBJS)\bench.lbc option stack=%i + wlink @$(OBJS)\bench.lbc + +data : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (htmltest.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\bench_bench.obj : .AUTODEPEND .\bench.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $< + +$(OBJS)\bench_htmlpars.obj : .AUTODEPEND .\htmlparser\htmlpars.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $< + +$(OBJS)\bench_htmltag.obj : .AUTODEPEND .\htmlparser\htmltag.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $< + +$(OBJS)\bench_ipcclient.obj : .AUTODEPEND .\ipcclient.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $< + +$(OBJS)\bench_mbconv.obj : .AUTODEPEND .\mbconv.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $< + +$(OBJS)\bench_strings.obj : .AUTODEPEND .\strings.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $< + +$(OBJS)\bench_tls.obj : .AUTODEPEND .\tls.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $< + +$(OBJS)\bench_printfbench.obj : .AUTODEPEND .\printfbench.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(BENCH_CXXFLAGS) $< + diff --git a/tests/makefile.bcc b/tests/makefile.bcc index c86b0f1b3c..a89dd76b39 100644 --- a/tests/makefile.bcc +++ b/tests/makefile.bcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -168,10 +168,10 @@ LIBTYPE_SUFFIX = lib LIBTYPE_SUFFIX = dll !endif !if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = !endif !if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = !endif !if "$(USE_GUI)" == "1" __test_gui___depname = $(OBJS)\test_gui.exe @@ -242,13 +242,13 @@ __OPTIMIZEFLAG = -Od __OPTIMIZEFLAG = -O2 !endif !if "$(USE_THREADS)" == "0" -__THREADSFLAG = +__THREADSFLAG = !endif !if "$(USE_THREADS)" == "1" __THREADSFLAG = mt !endif !if "$(USE_THREADS)" == "0" -__THREADSFLAG_0 = +__THREADSFLAG_0 = !endif !if "$(USE_THREADS)" == "1" __THREADSFLAG_0 = -tWM @@ -257,13 +257,13 @@ __THREADSFLAG_0 = -tWM __RUNTIME_LIBS = -tWR !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS = +__RUNTIME_LIBS = !endif !if "$(RUNTIME_LIBS)" == "dynamic" __RUNTIME_LIBS_0 = i !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_0 = +__RUNTIME_LIBS_0 = !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -339,7 +339,7 @@ $(OBJS): all: $(OBJS)\test.exe $(__test_gui___depname) data fr -clean: +clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\*.csm del $(OBJS)\*.csm @@ -368,11 +368,11 @@ $(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj $(TEST_GUI_OBJECTS) $(OBJS)\t | !endif -data: +data: if not exist $(OBJS) mkdir $(OBJS) for %f in (horse.ani horse.bmp horse.cur horse.gif horse.ico horse.jpg horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) -fr: +fr: if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr for %f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%f copy .\intl\fr\%f $(OBJS)\intl\fr diff --git a/tests/makefile.gcc b/tests/makefile.gcc index d2c93527c3..79269cebb8 100644 --- a/tests/makefile.gcc +++ b/tests/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -164,10 +164,10 @@ ifeq ($(SHARED),1) LIBTYPE_SUFFIX = dll endif ifeq ($(MONOLITHIC),0) -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = endif ifeq ($(MONOLITHIC),1) -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = endif ifeq ($(USE_GUI),1) __test_gui___depname = $(OBJS)\test_gui.exe @@ -243,13 +243,13 @@ ifeq ($(USE_RTTI),0) __RTTIFLAG = -fno-rtti endif ifeq ($(USE_RTTI),1) -__RTTIFLAG = +__RTTIFLAG = endif ifeq ($(USE_EXCEPTIONS),0) __EXCEPTIONSFLAG = -fno-exceptions endif ifeq ($(USE_EXCEPTIONS),1) -__EXCEPTIONSFLAG = +__EXCEPTIONSFLAG = endif ifeq ($(WXUNIV),1) __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -310,17 +310,17 @@ endif endif ifeq ($(BUILD),release) ifeq ($(DEBUG_INFO),default) -__DEBUGINFO = +__DEBUGINFO = endif endif ifeq ($(DEBUG_INFO),0) -__DEBUGINFO = +__DEBUGINFO = endif ifeq ($(DEBUG_INFO),1) __DEBUGINFO = -g endif ifeq ($(USE_THREADS),0) -__THREADSFLAG = +__THREADSFLAG = endif ifeq ($(USE_THREADS),1) __THREADSFLAG = -mthreads @@ -335,7 +335,7 @@ $(OBJS): all: $(OBJS)\test.exe $(__test_gui___depname) data fr -clean: +clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\*.d del $(OBJS)\*.d -if exist $(OBJS)\test.exe del $(OBJS)\test.exe @@ -349,11 +349,11 @@ $(OBJS)\test_gui.exe: $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample_rc.o $(CXX) -o $@ $(TEST_GUI_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS) $(LDFLAGS) $(__WXLIB_MEDIA_p) $(__WXLIB_XRC_p) $(__WXLIB_XML_p) $(__WXLIB_ADV_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet endif -data: +data: if not exist $(OBJS) mkdir $(OBJS) for %%f in (horse.ani horse.bmp horse.cur horse.gif horse.ico horse.jpg horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) -fr: +fr: if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr for %%f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%%f copy .\intl\fr\%%f $(OBJS)\intl\fr diff --git a/tests/makefile.vc b/tests/makefile.vc index 504d1ef33f..547b183bbf 100644 --- a/tests/makefile.vc +++ b/tests/makefile.vc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -20,8 +20,8 @@ LIBDIRNAME = \ .\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \ - /Fd$(OBJS)\test.pdb $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ +TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \ + /Fd$(OBJS)\test.pdb $(__DEBUGINFO_2) $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) \ $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) \ @@ -98,15 +98,15 @@ TEST_OBJECTS = \ $(OBJS)\test_weakref.obj \ $(OBJS)\test_xlocale.obj \ $(OBJS)\test_xmltest.obj -TEST_GUI_CXXFLAGS = /M$(__RUNTIME_LIBS_23)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) /Fd$(OBJS)\test_gui.pdb $(____DEBUGRUNTIME) \ - $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\include /W4 /I. $(__DLLFLAG_p) \ - /I.\..\samples /DNOPCH $(CPPUNIT_CFLAGS) /D_CONSOLE $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"testprec.h" /Fp"$(OBJS)\testprec_test_gui.pch" \ - $(CPPFLAGS) $(CXXFLAGS) +TEST_GUI_CXXFLAGS = /M$(__RUNTIME_LIBS_27)$(__DEBUGRUNTIME) /DWIN32 \ + $(__DEBUGINFO) /Fd$(OBJS)\test_gui.pdb $(__DEBUGINFO_19) \ + $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\include /W4 /I. \ + $(__DLLFLAG_p) /I.\..\samples /DNOPCH $(CPPUNIT_CFLAGS) /D_CONSOLE \ + $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"testprec.h" \ + /Fp"$(OBJS)\testprec_test_gui.pch" $(CPPFLAGS) $(CXXFLAGS) TEST_GUI_OBJECTS = \ $(OBJS)\test_gui_dummy.obj \ $(OBJS)\test_gui_test.obj \ @@ -192,37 +192,61 @@ LINK_TARGET_CPU = /MACHINE:AMD64 LINK_TARGET_CPU = /MACHINE:IA64 !endif !if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = !endif !if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_0) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_0) !endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D +__RUNTIME_LIBS_10 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG) +__RUNTIME_LIBS_10 = $(__THREADSFLAG) !endif !if "$(USE_GUI)" == "1" __test_gui___depname = $(OBJS)\test_gui.exe !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_19 = $(__DEBUGRUNTIME_0) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_19 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_19 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_19 = $(__DEBUGRUNTIME_0) +!endif !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_17_p_1 = /d _DEBUG +____DEBUGRUNTIME_20_p_1 = /d _DEBUG !endif !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_17_p_1 = +____DEBUGRUNTIME_20_p_1 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_17_p_1 = +____DEBUGRUNTIME_20_p_1 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_17_p_1 = /d _DEBUG +____DEBUGRUNTIME_20_p_1 = /d _DEBUG !endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_23 = D +__RUNTIME_LIBS_27 = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_23 = $(__THREADSFLAG) +__RUNTIME_LIBS_27 = $(__THREADSFLAG) !endif !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" __NO_VC_CRTDBG_p_3 = /d __NO_VC_CRTDBG__ @@ -293,10 +317,10 @@ __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib __DEBUGINFO = /Zi !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = +__DEBUGINFO = !endif !if "$(DEBUG_INFO)" == "0" -__DEBUGINFO = +__DEBUGINFO = !endif !if "$(DEBUG_INFO)" == "1" __DEBUGINFO = /Zi @@ -305,10 +329,10 @@ __DEBUGINFO = /Zi __DEBUGINFO_1 = /DEBUG !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = +__DEBUGINFO_1 = !endif !if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = +__DEBUGINFO_1 = !endif !if "$(DEBUG_INFO)" == "1" __DEBUGINFO_1 = /DEBUG @@ -317,10 +341,10 @@ __DEBUGINFO_1 = /DEBUG ____DEBUGRUNTIME = /D_DEBUG !endif !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME = +____DEBUGRUNTIME = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME = +____DEBUGRUNTIME = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" ____DEBUGRUNTIME = /D_DEBUG @@ -329,14 +353,26 @@ ____DEBUGRUNTIME = /D_DEBUG __DEBUGRUNTIME = d !endif !if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME = +__DEBUGRUNTIME = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME = +__DEBUGRUNTIME = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" __DEBUGRUNTIME = d !endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_0 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_0 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_0 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_0 = +!endif !if "$(BUILD)" == "debug" __OPTIMIZEFLAG = /Od !endif @@ -350,13 +386,13 @@ __THREADSFLAG = L __THREADSFLAG = T !endif !if "$(USE_RTTI)" == "0" -__RTTIFLAG = +__RTTIFLAG = !endif !if "$(USE_RTTI)" == "1" __RTTIFLAG = /GR !endif !if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG = +__EXCEPTIONSFLAG = !endif !if "$(USE_EXCEPTIONS)" == "1" __EXCEPTIONSFLAG = /EHsc @@ -429,7 +465,7 @@ $(OBJS): all: $(OBJS)\test.exe $(__test_gui___depname) data fr -clean: +clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\*.pch del $(OBJS)\*.pch @@ -452,11 +488,11 @@ $(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj $(TEST_GUI_OBJECTS) $(OBJS)\te << !endif -data: +data: if not exist $(OBJS) mkdir $(OBJS) for %f in (horse.ani horse.bmp horse.cur horse.gif horse.ico horse.jpg horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) -fr: +fr: if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr for %f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%f copy .\intl\fr\%f $(OBJS)\intl\fr @@ -671,7 +707,7 @@ $(OBJS)\test_gui_dummy.obj: .\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) /Yctestprec.h .\dummy.cpp $(OBJS)\test_gui_sample.res: .\..\samples\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_17_p_1) $(__NO_VC_CRTDBG_p_3) /d __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) $(__GFXCTX_DEFINE_p_3) /i $(SETUPHDIR) /i .\..\include /i . $(__DLLFLAG_p_3) /i .\..\samples /d NOPCH /d _CONSOLE .\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_20_p_1) $(__NO_VC_CRTDBG_p_3) /d __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) $(__GFXCTX_DEFINE_p_3) /i $(SETUPHDIR) /i .\..\include /i . $(__DLLFLAG_p_3) /i .\..\samples /d NOPCH /d _CONSOLE .\..\samples\sample.rc $(OBJS)\test_gui_test.obj: .\test.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\test.cpp diff --git a/tests/makefile.wat b/tests/makefile.wat index 0c5d3f630e..c06ffe8443 100644 --- a/tests/makefile.wat +++ b/tests/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -63,10 +63,10 @@ LIBTYPE_SUFFIX = dll !endif EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = !endif !ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = +EXTRALIBS_FOR_BASE = !endif __test_gui___depname = !ifeq USE_GUI 1 @@ -136,11 +136,11 @@ __DEBUGINFO_1 = debug all !endif !ifeq BUILD release !ifeq DEBUG_INFO default -__DEBUGINFO_1 = +__DEBUGINFO_1 = !endif !endif !ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = +__DEBUGINFO_1 = !endif !ifeq DEBUG_INFO 1 __DEBUGINFO_1 = debug all @@ -154,7 +154,7 @@ __OPTIMIZEFLAG = -ot -ox !endif __THREADSFLAG = !ifeq USE_THREADS 0 -__THREADSFLAG = +__THREADSFLAG = !endif !ifeq USE_THREADS 1 __THREADSFLAG = -bm @@ -164,18 +164,18 @@ __RUNTIME_LIBS = __RUNTIME_LIBS = -br !endif !ifeq RUNTIME_LIBS static -__RUNTIME_LIBS = +__RUNTIME_LIBS = !endif __RTTIFLAG = !ifeq USE_RTTI 0 -__RTTIFLAG = +__RTTIFLAG = !endif !ifeq USE_RTTI 1 __RTTIFLAG = -xr !endif __EXCEPTIONSFLAG = !ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG = +__EXCEPTIONSFLAG = !endif !ifeq USE_EXCEPTIONS 1 __EXCEPTIONSFLAG = -xs @@ -371,7 +371,7 @@ $(OBJS) : all : .SYMBOLIC $(OBJS)\test.exe $(__test_gui___depname) data fr -clean : .SYMBOLIC +clean : .SYMBOLIC -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc @@ -406,11 +406,11 @@ $(OBJS)\test_gui.exe : $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res wlink @$(OBJS)\test_gui.lbc !endif -data : .SYMBOLIC +data : .SYMBOLIC if not exist $(OBJS) mkdir $(OBJS) for %f in (horse.ani horse.bmp horse.cur horse.gif horse.ico horse.jpg horse.pcx horse.png horse.pnm horse.tga horse.tif horse.xpm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) -fr : .SYMBOLIC +fr : .SYMBOLIC if not exist $(OBJS)\intl\fr mkdir $(OBJS)\intl\fr for %f in (internat.po internat.mo) do if not exist $(OBJS)\intl\fr\%f copy .\intl\fr\%f $(OBJS)\intl\fr diff --git a/tests/test_test.dsp b/tests/test_test.dsp index b7cdc5070c..0389ed568e 100644 --- a/tests/test_test.dsp +++ b/tests/test_test.dsp @@ -46,8 +46,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\test" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivudll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivudll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivudll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivudll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswunivu" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswunivu" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe @@ -92,8 +92,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\test" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswudll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswudll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswudll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswudll\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswu" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswu" /i ".\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe @@ -138,8 +138,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\test" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivu\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivu\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivu\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswunivu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswunivu\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswunivu" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswunivu" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe @@ -184,8 +184,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\test" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswu\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\test.pdb /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswu\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswu\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\test.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswu" /I ".\..\include" /W4 /I "." /Yu"testprec.h" /Fp"vc_mswu\testprec_test.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswu" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswu" /i ".\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe @@ -293,10 +293,10 @@ SOURCE=.\events\evthandler.cpp # End Source File # Begin Source File -SOURCE=.\events\evtsource.cpp -# End Source File -# Begin Source File - +SOURCE=.\events\evtsource.cpp +# End Source File +# Begin Source File + SOURCE=.\exec\exec.cpp # End Source File # Begin Source File @@ -341,10 +341,10 @@ SOURCE=.\formatconverter\formatconvertertest.cpp # End Source File # Begin Source File -SOURCE=.\fswatcher\fswatchertest.cpp -# End Source File -# Begin Source File - +SOURCE=.\fswatcher\fswatchertest.cpp +# End Source File +# Begin Source File + SOURCE=.\hashes\hashes.cpp # End Source File # Begin Source File diff --git a/tests/test_test_gui.dsp b/tests/test_test_gui.dsp index 0248f7c5ef..65dbc442d7 100644 --- a/tests/test_test_gui.dsp +++ b/tests/test_test_gui.dsp @@ -46,8 +46,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\test_gui" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswunivu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivudll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswunivu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivudll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\test_gui.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswunivu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivudll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\test_gui.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswunivu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivudll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswunivu" /i ".\..\include" /i "." /d "WXUSINGDLL" /i ".\..\samples" /d "NOPCH" /d _CONSOLE # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswunivu" /i ".\..\include" /i "." /d "WXUSINGDLL" /i ".\..\samples" /d "NOPCH" /d _CONSOLE BSC32=bscmake.exe @@ -92,8 +92,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\test_gui" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswudll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswudll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test_gui.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswudll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\test_gui.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_dll\mswu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswudll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "NOPCH" /D "_CONSOLE" /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswu" /i ".\..\include" /i "." /d "WXUSINGDLL" /i ".\..\samples" /d "NOPCH" /d _CONSOLE # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_dll\mswu" /i ".\..\include" /i "." /d "WXUSINGDLL" /i ".\..\samples" /d "NOPCH" /d _CONSOLE BSC32=bscmake.exe @@ -138,8 +138,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\test_gui" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswunivu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivu\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswunivu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivu\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\test_gui.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswunivu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivu\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\test_gui.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswunivu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivu\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswunivu" /i ".\..\include" /i "." /i ".\..\samples" /d "NOPCH" /d _CONSOLE # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswunivu" /i ".\..\include" /i "." /i ".\..\samples" /d "NOPCH" /d _CONSOLE BSC32=bscmake.exe @@ -184,8 +184,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\test_gui" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswu\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\test_gui.pdb /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswu\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\test_gui.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswu\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\test_gui.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\lib\vc_lib\mswu" /I ".\..\include" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswu\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "NOPCH" /D "_CONSOLE" /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswu" /i ".\..\include" /i "." /i ".\..\samples" /d "NOPCH" /d _CONSOLE # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\lib\vc_lib\mswu" /i ".\..\include" /i "." /i ".\..\samples" /d "NOPCH" /d _CONSOLE BSC32=bscmake.exe @@ -243,10 +243,10 @@ SOURCE=.\events\clone.cpp # End Source File # Begin Source File -SOURCE=.\graphics\colour.cpp -# End Source File -# Begin Source File - +SOURCE=.\graphics\colour.cpp +# End Source File +# Begin Source File + SOURCE=.\controls\comboboxtest.cpp # End Source File # Begin Source File diff --git a/tests/test_vc7_test.vcproj b/tests/test_vc7_test.vcproj index bf32fc2683..5ae3573fa2 100644 --- a/tests/test_vc7_test.vcproj +++ b/tests/test_vc7_test.vcproj @@ -2,7 +2,7 @@ @@ -116,13 +116,15 @@ AdditionalOptions="" AdditionalDependencies="wxbase29u_net.lib wxbase29u_xml.lib wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\test.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\test.pdb" SubSystem="1" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> - - + + - - + + @@ -116,13 +116,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_media.lib wxmsw29u_xrc.lib wxbase29u_xml.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxmsw29u_core.lib wxbase29u_net.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\test_gui.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\test_gui.pdb" SubSystem="1" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> - - + + @@ -182,7 +182,7 @@ AdditionalOptions="" AdditionalDependencies="wxbase29u_net.lib wxbase29u_xml.lib wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\test.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\lib\vc_lib" GenerateManifest="true" @@ -190,6 +190,8 @@ ProgramDatabaseFile="vc_mswu\test.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - - + + @@ -988,10 +996,10 @@ > - - + + diff --git a/tests/test_vc8_test_gui.vcproj b/tests/test_vc8_test_gui.vcproj index 0dacb80a04..53f4863ca4 100644 --- a/tests/test_vc8_test_gui.vcproj +++ b/tests/test_vc8_test_gui.vcproj @@ -2,7 +2,7 @@ @@ -182,7 +182,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_media.lib wxmsw29u_xrc.lib wxbase29u_xml.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxmsw29u_core.lib wxbase29u_net.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\test_gui.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\lib\vc_lib" GenerateManifest="true" @@ -190,6 +190,8 @@ ProgramDatabaseFile="vc_mswu\test_gui.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - - + + diff --git a/tests/test_vc9_test.vcproj b/tests/test_vc9_test.vcproj index a8a501511b..fc3f179dcc 100644 --- a/tests/test_vc9_test.vcproj +++ b/tests/test_vc9_test.vcproj @@ -2,7 +2,7 @@ @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -139,7 +139,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -178,7 +178,7 @@ AdditionalOptions="" AdditionalDependencies="wxbase29u_net.lib wxbase29u_xml.lib wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\test.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\lib\vc_lib" GenerateManifest="true" @@ -186,6 +186,8 @@ ProgramDatabaseFile="vc_mswu\test.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -329,7 +331,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -368,7 +370,7 @@ AdditionalOptions="" AdditionalDependencies="wxbase29u_net.lib wxbase29u_xml.lib wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\test.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\lib\vc_lib" GenerateManifest="true" @@ -376,6 +378,8 @@ ProgramDatabaseFile="vc_mswunivu\test.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -519,7 +523,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -558,7 +562,7 @@ AdditionalOptions="" AdditionalDependencies="wxbase29u_net.lib wxbase29u_xml.lib wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\test.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\lib\vc_dll" GenerateManifest="true" @@ -566,6 +570,8 @@ ProgramDatabaseFile="vc_mswudll\test.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -709,7 +715,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -748,7 +754,7 @@ AdditionalOptions="" AdditionalDependencies="wxbase29u_net.lib wxbase29u_xml.lib wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\test.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\lib\vc_dll" GenerateManifest="true" @@ -756,6 +762,8 @@ ProgramDatabaseFile="vc_mswunivudll\test.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - - + + @@ -960,10 +968,10 @@ > - - + + diff --git a/tests/test_vc9_test_gui.vcproj b/tests/test_vc9_test_gui.vcproj index e9c44cc253..3fcefe9a7f 100644 --- a/tests/test_vc9_test_gui.vcproj +++ b/tests/test_vc9_test_gui.vcproj @@ -2,7 +2,7 @@ @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -139,7 +139,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -178,7 +178,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_media.lib wxmsw29u_xrc.lib wxbase29u_xml.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxmsw29u_core.lib wxbase29u_net.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\test_gui.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\lib\vc_lib" GenerateManifest="true" @@ -186,6 +186,8 @@ ProgramDatabaseFile="vc_mswu\test_gui.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -329,7 +331,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -368,7 +370,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_media.lib wxmswuniv29u_xrc.lib wxbase29u_xml.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxmswuniv29u_core.lib wxbase29u_net.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\test_gui.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\lib\vc_lib" GenerateManifest="true" @@ -376,6 +378,8 @@ ProgramDatabaseFile="vc_mswunivu\test_gui.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -519,7 +523,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -558,7 +562,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_media.lib wxmsw29u_xrc.lib wxbase29u_xml.lib wxmsw29u_adv.lib wxmsw29u_html.lib wxmsw29u_core.lib wxbase29u_net.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\test_gui.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\lib\vc_dll" GenerateManifest="true" @@ -566,6 +570,8 @@ ProgramDatabaseFile="vc_mswudll\test_gui.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -709,7 +715,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -748,7 +754,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_media.lib wxmswuniv29u_xrc.lib wxbase29u_xml.lib wxmswuniv29u_adv.lib wxmswuniv29u_html.lib wxmswuniv29u_core.lib wxbase29u_net.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\test_gui.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\lib\vc_dll" GenerateManifest="true" @@ -756,6 +762,8 @@ ProgramDatabaseFile="vc_mswunivudll\test_gui.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - - + + diff --git a/utils/Makefile.in b/utils/Makefile.in index dbc96d8fce..5792a120a4 100644 --- a/utils/Makefile.in +++ b/utils/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/emulator/src/Makefile.in b/utils/emulator/src/Makefile.in index 05bb6fb325..f386bb7bf5 100644 --- a/utils/emulator/src/Makefile.in +++ b/utils/emulator/src/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/emulator/src/emulator.dsp b/utils/emulator/src/emulator.dsp index 7bbff6f35e..6feef867e7 100644 --- a/utils/emulator/src/emulator.dsp +++ b/utils/emulator/src/emulator.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\wxemulator" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wxemulator.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wxemulator.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wxemulator.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wxemulator.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\wxemulator" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wxemulator.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wxemulator.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wxemulator.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wxemulator.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\wxemulator" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wxemulator.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wxemulator.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wxemulator.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wxemulator.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\wxemulator" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\wxemulator.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\wxemulator.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\wxemulator.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\wxemulator.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH diff --git a/utils/emulator/src/emulator_vc7.vcproj b/utils/emulator/src/emulator_vc7.vcproj index fc72bfeb8f..285a19e4cd 100644 --- a/utils/emulator/src/emulator_vc7.vcproj +++ b/utils/emulator/src/emulator_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\wxemulator.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\wxemulator.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\wxemulator.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\wxemulator.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\wxemulator.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\wxemulator.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\wxemulator.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\wxemulator.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\wxemulator.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\wxemulator.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\wxemulator.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\wxemulator.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXEMULATOR_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\wxemulator.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ - $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_9) \ - $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS) -WXEMULATOR_OBJECTS = \ - $(OBJS)\wxemulator_sample.res \ - $(OBJS)\wxemulator_emulator.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\wxemulator.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\wxemulator.exe del $(OBJS)\wxemulator.exe - -if exist $(OBJS)\wxemulator.ilk del $(OBJS)\wxemulator.ilk - -if exist $(OBJS)\wxemulator.pdb del $(OBJS)\wxemulator.pdb - -$(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxemulator.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(WXEMULATOR_OBJECTS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (default.wxe ipaq.wxe bluegradient.jpg ipaq01.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\wxemulator_sample.res: .\..\..\..\samples\sample.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\..\..\..\samples\sample.rc - -$(OBJS)\wxemulator_emulator.obj: .\emulator.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WXEMULATOR_CXXFLAGS) .\emulator.cpp - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +WXEMULATOR_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\wxemulator.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \ + $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +WXEMULATOR_OBJECTS = \ + $(OBJS)\wxemulator_emulator.obj +WXEMULATOR_RESOURCES = \ + $(OBJS)\wxemulator_sample.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\wxemulator.exe data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\wxemulator.exe del $(OBJS)\wxemulator.exe + -if exist $(OBJS)\wxemulator.ilk del $(OBJS)\wxemulator.ilk + -if exist $(OBJS)\wxemulator.pdb del $(OBJS)\wxemulator.pdb + +$(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxemulator.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(WXEMULATOR_OBJECTS) $(WXEMULATOR_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (default.wxe ipaq.wxe bluegradient.jpg ipaq01.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\wxemulator_sample.res: .\..\..\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\..\..\..\samples\sample.rc + +$(OBJS)\wxemulator_emulator.obj: .\emulator.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXEMULATOR_CXXFLAGS) .\emulator.cpp + diff --git a/utils/emulator/src/makefile.wat b/utils/emulator/src/makefile.wat index b940052509..334cb41c16 100644 --- a/utils/emulator/src/makefile.wat +++ b/utils/emulator/src/makefile.wat @@ -1,264 +1,264 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXEMULATOR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & - $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) -WXEMULATOR_OBJECTS = & - $(OBJS)\wxemulator_emulator.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\wxemulator.exe data - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\wxemulator.exe del $(OBJS)\wxemulator.exe - -$(OBJS)\wxemulator.exe : $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample.res - @%create $(OBJS)\wxemulator.lbc - @%append $(OBJS)\wxemulator.lbc option quiet - @%append $(OBJS)\wxemulator.lbc name $^@ - @%append $(OBJS)\wxemulator.lbc option caseexact - @%append $(OBJS)\wxemulator.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(WXEMULATOR_OBJECTS)) do @%append $(OBJS)\wxemulator.lbc file %i - @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\wxemulator.lbc library %i - @%append $(OBJS)\wxemulator.lbc option resource=$(OBJS)\wxemulator_sample.res - @for %i in () do @%append $(OBJS)\wxemulator.lbc option stack=%i - wlink @$(OBJS)\wxemulator.lbc - -data : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (default.wxe ipaq.wxe bluegradient.jpg ipaq01.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\wxemulator_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< - -$(OBJS)\wxemulator_emulator.obj : .AUTODEPEND .\emulator.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WXEMULATOR_CXXFLAGS) $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +WXEMULATOR_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & + $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & + $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) +WXEMULATOR_OBJECTS = & + $(OBJS)\wxemulator_emulator.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\wxemulator.exe data + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\wxemulator.exe del $(OBJS)\wxemulator.exe + +$(OBJS)\wxemulator.exe : $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample.res + @%create $(OBJS)\wxemulator.lbc + @%append $(OBJS)\wxemulator.lbc option quiet + @%append $(OBJS)\wxemulator.lbc name $^@ + @%append $(OBJS)\wxemulator.lbc option caseexact + @%append $(OBJS)\wxemulator.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(WXEMULATOR_OBJECTS)) do @%append $(OBJS)\wxemulator.lbc file %i + @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\wxemulator.lbc library %i + @%append $(OBJS)\wxemulator.lbc option resource=$(OBJS)\wxemulator_sample.res + @for %i in () do @%append $(OBJS)\wxemulator.lbc option stack=%i + wlink @$(OBJS)\wxemulator.lbc + +data : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (default.wxe ipaq.wxe bluegradient.jpg ipaq01.jpg) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\wxemulator_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + +$(OBJS)\wxemulator_emulator.obj : .AUTODEPEND .\emulator.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WXEMULATOR_CXXFLAGS) $< + diff --git a/utils/execmon/Makefile.in b/utils/execmon/Makefile.in index eee591b631..0d75ebc840 100644 --- a/utils/execmon/Makefile.in +++ b/utils/execmon/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/execmon/execmon.dsp b/utils/execmon/execmon.dsp index 2e2557debb..2ea0afc7f3 100644 --- a/utils/execmon/execmon.dsp +++ b/utils/execmon/execmon.dsp @@ -46,8 +46,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\execmon" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\execmon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\execmon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\execmon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\execmon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe @@ -92,8 +92,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\execmon" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\execmon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\execmon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\execmon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\execmon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe @@ -138,8 +138,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\execmon" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\execmon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\execmon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\execmon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\execmon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe @@ -184,8 +184,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\execmon" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\execmon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\execmon.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\execmon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\execmon.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe diff --git a/utils/execmon/execmon_vc7.vcproj b/utils/execmon/execmon_vc7.vcproj index 4f399216dd..1448f20d21 100644 --- a/utils/execmon/execmon_vc7.vcproj +++ b/utils/execmon/execmon_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\execmon.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\execmon.pdb" SubSystem="1" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\execmon.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\execmon.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\execmon.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\execmon.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\execmon.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\execmon.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\execmon.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\execmon.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\execmon.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\execmon.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -EXECMON_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\execmon.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) \ - $(CXXFLAGS) -EXECMON_OBJECTS = \ - $(OBJS)\execmon_execmon.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(USE_XRC)" == "1" -__execmon___depname = $(OBJS)\execmon.exe -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(__execmon___depname) - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe - -if exist $(OBJS)\execmon.ilk del $(OBJS)\execmon.ilk - -if exist $(OBJS)\execmon.pdb del $(OBJS)\execmon.pdb - -!if "$(USE_XRC)" == "1" -$(OBJS)\execmon.exe: $(EXECMON_OBJECTS) - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\execmon.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< - $(EXECMON_OBJECTS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< -!endif - -$(OBJS)\execmon_execmon.obj: .\execmon.cpp - $(CXX) /c /nologo /TP /Fo$@ $(EXECMON_CXXFLAGS) .\execmon.cpp - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +EXECMON_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\execmon.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +EXECMON_OBJECTS = \ + $(OBJS)\execmon_execmon.obj + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(USE_XRC)" == "1" +__execmon___depname = $(OBJS)\execmon.exe +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__execmon___depname) + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe + -if exist $(OBJS)\execmon.ilk del $(OBJS)\execmon.ilk + -if exist $(OBJS)\execmon.pdb del $(OBJS)\execmon.pdb + +!if "$(USE_XRC)" == "1" +$(OBJS)\execmon.exe: $(EXECMON_OBJECTS) + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\execmon.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< + $(EXECMON_OBJECTS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< +!endif + +$(OBJS)\execmon_execmon.obj: .\execmon.cpp + $(CXX) /c /nologo /TP /Fo$@ $(EXECMON_CXXFLAGS) .\execmon.cpp + diff --git a/utils/execmon/makefile.wat b/utils/execmon/makefile.wat index 90852b7f7c..c77d0c8d12 100644 --- a/utils/execmon/makefile.wat +++ b/utils/execmon/makefile.wat @@ -1,245 +1,245 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__execmon___depname = -!ifeq USE_XRC 1 -__execmon___depname = $(OBJS)\execmon.exe -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -EXECMON_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -dwxUSE_GUI=0 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) -EXECMON_OBJECTS = & - $(OBJS)\execmon_execmon.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(__execmon___depname) - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe - -!ifeq USE_XRC 1 -$(OBJS)\execmon.exe : $(EXECMON_OBJECTS) - @%create $(OBJS)\execmon.lbc - @%append $(OBJS)\execmon.lbc option quiet - @%append $(OBJS)\execmon.lbc name $^@ - @%append $(OBJS)\execmon.lbc option caseexact - @%append $(OBJS)\execmon.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) - @for %i in ($(EXECMON_OBJECTS)) do @%append $(OBJS)\execmon.lbc file %i - @for %i in ( $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\execmon.lbc library %i - @%append $(OBJS)\execmon.lbc - @for %i in () do @%append $(OBJS)\execmon.lbc option stack=%i - wlink @$(OBJS)\execmon.lbc -!endif - -$(OBJS)\execmon_execmon.obj : .AUTODEPEND .\execmon.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(EXECMON_CXXFLAGS) $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__execmon___depname = +!ifeq USE_XRC 1 +__execmon___depname = $(OBJS)\execmon.exe +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +EXECMON_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -dwxUSE_GUI=0 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) +EXECMON_OBJECTS = & + $(OBJS)\execmon_execmon.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(__execmon___depname) + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\execmon.exe del $(OBJS)\execmon.exe + +!ifeq USE_XRC 1 +$(OBJS)\execmon.exe : $(EXECMON_OBJECTS) + @%create $(OBJS)\execmon.lbc + @%append $(OBJS)\execmon.lbc option quiet + @%append $(OBJS)\execmon.lbc name $^@ + @%append $(OBJS)\execmon.lbc option caseexact + @%append $(OBJS)\execmon.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) + @for %i in ($(EXECMON_OBJECTS)) do @%append $(OBJS)\execmon.lbc file %i + @for %i in ( $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\execmon.lbc library %i + @%append $(OBJS)\execmon.lbc + @for %i in () do @%append $(OBJS)\execmon.lbc option stack=%i + wlink @$(OBJS)\execmon.lbc +!endif + +$(OBJS)\execmon_execmon.obj : .AUTODEPEND .\execmon.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(EXECMON_CXXFLAGS) $< + diff --git a/utils/helpview/src/Makefile.in b/utils/helpview/src/Makefile.in index 5ee5c6c38c..9df2af20eb 100644 --- a/utils/helpview/src/Makefile.in +++ b/utils/helpview/src/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/helpview/src/helpview.dsp b/utils/helpview/src/helpview.dsp index 23f7677abb..6a25f4996d 100644 --- a/utils/helpview/src/helpview.dsp +++ b/utils/helpview/src/helpview.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\helpview" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\helpview" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\helpview" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\helpview" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\helpview.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\helpview.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH diff --git a/utils/helpview/src/helpview_vc7.vcproj b/utils/helpview/src/helpview_vc7.vcproj index a6f23c72ff..5617e37afa 100644 --- a/utils/helpview/src/helpview_vc7.vcproj +++ b/utils/helpview/src/helpview_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\helpview.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\helpview.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\helpview.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\helpview.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\helpview.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\helpview.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\helpview.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\helpview.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\helpview.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\helpview.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\helpview.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\helpview.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -HELPVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\helpview.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ - $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_9) \ - $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS) -HELPVIEW_OBJECTS = \ - $(OBJS)\helpview_helpview.obj \ - $(OBJS)\helpview_helpview.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_HTML_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_NET_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\helpview.exe data - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe - -if exist $(OBJS)\helpview.ilk del $(OBJS)\helpview.ilk - -if exist $(OBJS)\helpview.pdb del $(OBJS)\helpview.pdb - -$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\helpview.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(HELPVIEW_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -data: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\helpview_helpview.obj: .\helpview.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HELPVIEW_CXXFLAGS) .\helpview.cpp - -$(OBJS)\helpview_helpview.res: .\helpview.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\helpview.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +HELPVIEW_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\helpview.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \ + $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +HELPVIEW_OBJECTS = \ + $(OBJS)\helpview_helpview.obj +HELPVIEW_RESOURCES = \ + $(OBJS)\helpview_helpview.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_NET_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\helpview.exe data + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe + -if exist $(OBJS)\helpview.ilk del $(OBJS)\helpview.ilk + -if exist $(OBJS)\helpview.pdb del $(OBJS)\helpview.pdb + +$(OBJS)\helpview.exe: $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\helpview.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(HELPVIEW_OBJECTS) $(HELPVIEW_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +data: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\helpview_helpview.obj: .\helpview.cpp + $(CXX) /c /nologo /TP /Fo$@ $(HELPVIEW_CXXFLAGS) .\helpview.cpp + +$(OBJS)\helpview_helpview.res: .\helpview.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\helpview.rc + diff --git a/utils/helpview/src/makefile.wat b/utils/helpview/src/makefile.wat index dab621c187..3b83fb7f99 100644 --- a/utils/helpview/src/makefile.wat +++ b/utils/helpview/src/makefile.wat @@ -1,274 +1,274 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_NET_p = -!ifeq MONOLITHIC 0 -__WXLIB_NET_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -HELPVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & - $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & - $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) -HELPVIEW_OBJECTS = & - $(OBJS)\helpview_helpview.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\helpview.exe data - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe - -$(OBJS)\helpview.exe : $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res - @%create $(OBJS)\helpview.lbc - @%append $(OBJS)\helpview.lbc option quiet - @%append $(OBJS)\helpview.lbc name $^@ - @%append $(OBJS)\helpview.lbc option caseexact - @%append $(OBJS)\helpview.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(HELPVIEW_OBJECTS)) do @%append $(OBJS)\helpview.lbc file %i - @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\helpview.lbc library %i - @%append $(OBJS)\helpview.lbc option resource=$(OBJS)\helpview_helpview.res - @for %i in () do @%append $(OBJS)\helpview.lbc option stack=%i - wlink @$(OBJS)\helpview.lbc - -data : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\helpview_helpview.obj : .AUTODEPEND .\helpview.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HELPVIEW_CXXFLAGS) $< - -$(OBJS)\helpview_helpview.res : .AUTODEPEND .\helpview.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_NET_p = +!ifeq MONOLITHIC 0 +__WXLIB_NET_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +HELPVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & + $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & + $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) +HELPVIEW_OBJECTS = & + $(OBJS)\helpview_helpview.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\helpview.exe data + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\helpview.exe del $(OBJS)\helpview.exe + +$(OBJS)\helpview.exe : $(HELPVIEW_OBJECTS) $(OBJS)\helpview_helpview.res + @%create $(OBJS)\helpview.lbc + @%append $(OBJS)\helpview.lbc option quiet + @%append $(OBJS)\helpview.lbc name $^@ + @%append $(OBJS)\helpview.lbc option caseexact + @%append $(OBJS)\helpview.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(HELPVIEW_OBJECTS)) do @%append $(OBJS)\helpview.lbc file %i + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\helpview.lbc library %i + @%append $(OBJS)\helpview.lbc option resource=$(OBJS)\helpview_helpview.res + @for %i in () do @%append $(OBJS)\helpview.lbc option stack=%i + wlink @$(OBJS)\helpview.lbc + +data : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (test.zip) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\helpview_helpview.obj : .AUTODEPEND .\helpview.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(HELPVIEW_CXXFLAGS) $< + +$(OBJS)\helpview_helpview.res : .AUTODEPEND .\helpview.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + diff --git a/utils/hhp2cached/Makefile.in b/utils/hhp2cached/Makefile.in index 1f132d42ad..7c23b9779a 100644 --- a/utils/hhp2cached/Makefile.in +++ b/utils/hhp2cached/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/hhp2cached/hhp2cached.dsp b/utils/hhp2cached/hhp2cached.dsp index 99c666afac..36bf3c07e9 100644 --- a/utils/hhp2cached/hhp2cached.dsp +++ b/utils/hhp2cached/hhp2cached.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\hhp2cached" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\hhp2cached.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\hhp2cached.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\hhp2cached.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\hhp2cached.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\hhp2cached" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\hhp2cached.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\hhp2cached.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\hhp2cached.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\hhp2cached.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\hhp2cached" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\hhp2cached.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\hhp2cached.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\hhp2cached.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\hhp2cached.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\hhp2cached" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\hhp2cached.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\hhp2cached.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\hhp2cached.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\hhp2cached.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH diff --git a/utils/hhp2cached/hhp2cached_vc7.vcproj b/utils/hhp2cached/hhp2cached_vc7.vcproj index 023ff952b7..f4a067ab7d 100644 --- a/utils/hhp2cached/hhp2cached_vc7.vcproj +++ b/utils/hhp2cached/hhp2cached_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ 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 wininet.lib" OutputFile="vc_mswu\hhp2cached.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\hhp2cached.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ 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 wininet.lib" OutputFile="vc_mswu\hhp2cached.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\hhp2cached.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ 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 wininet.lib" OutputFile="vc_mswu\hhp2cached.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\hhp2cached.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ 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 wininet.lib" OutputFile="vc_mswunivu\hhp2cached.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\hhp2cached.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ 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 wininet.lib" OutputFile="vc_mswudll\hhp2cached.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\hhp2cached.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ 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 wininet.lib" OutputFile="vc_mswunivudll\hhp2cached.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\hhp2cached.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -HHP2CACHED_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\hhp2cached.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) \ - $(CPPFLAGS) $(CXXFLAGS) -HHP2CACHED_OBJECTS = \ - $(OBJS)\hhp2cached_hhp2cached.obj \ - $(OBJS)\hhp2cached_hhp2cached.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_HTML_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\hhp2cached.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\hhp2cached.exe del $(OBJS)\hhp2cached.exe - -if exist $(OBJS)\hhp2cached.ilk del $(OBJS)\hhp2cached.ilk - -if exist $(OBJS)\hhp2cached.pdb del $(OBJS)\hhp2cached.pdb - -$(OBJS)\hhp2cached.exe: $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\hhp2cached.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(HHP2CACHED_OBJECTS) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\hhp2cached_hhp2cached.obj: .\hhp2cached.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HHP2CACHED_CXXFLAGS) .\hhp2cached.cpp - -$(OBJS)\hhp2cached_hhp2cached.res: .\hhp2cached.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\hhp2cached.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +HHP2CACHED_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\hhp2cached.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +HHP2CACHED_OBJECTS = \ + $(OBJS)\hhp2cached_hhp2cached.obj +HHP2CACHED_RESOURCES = \ + $(OBJS)\hhp2cached_hhp2cached.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\hhp2cached.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\hhp2cached.exe del $(OBJS)\hhp2cached.exe + -if exist $(OBJS)\hhp2cached.ilk del $(OBJS)\hhp2cached.ilk + -if exist $(OBJS)\hhp2cached.pdb del $(OBJS)\hhp2cached.pdb + +$(OBJS)\hhp2cached.exe: $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\hhp2cached.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(HHP2CACHED_OBJECTS) $(HHP2CACHED_RESOURCES) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\hhp2cached_hhp2cached.obj: .\hhp2cached.cpp + $(CXX) /c /nologo /TP /Fo$@ $(HHP2CACHED_CXXFLAGS) .\hhp2cached.cpp + +$(OBJS)\hhp2cached_hhp2cached.res: .\hhp2cached.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\hhp2cached.rc + diff --git a/utils/hhp2cached/makefile.wat b/utils/hhp2cached/makefile.wat index 95b53a4462..f81dd3ec3d 100644 --- a/utils/hhp2cached/makefile.wat +++ b/utils/hhp2cached/makefile.wat @@ -1,265 +1,265 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -HHP2CACHED_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & - $(CXXFLAGS) -HHP2CACHED_OBJECTS = & - $(OBJS)\hhp2cached_hhp2cached.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\hhp2cached.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\hhp2cached.exe del $(OBJS)\hhp2cached.exe - -$(OBJS)\hhp2cached.exe : $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached.res - @%create $(OBJS)\hhp2cached.lbc - @%append $(OBJS)\hhp2cached.lbc option quiet - @%append $(OBJS)\hhp2cached.lbc name $^@ - @%append $(OBJS)\hhp2cached.lbc option caseexact - @%append $(OBJS)\hhp2cached.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(HHP2CACHED_OBJECTS)) do @%append $(OBJS)\hhp2cached.lbc file %i - @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\hhp2cached.lbc library %i - @%append $(OBJS)\hhp2cached.lbc option resource=$(OBJS)\hhp2cached_hhp2cached.res - @for %i in () do @%append $(OBJS)\hhp2cached.lbc option stack=%i - wlink @$(OBJS)\hhp2cached.lbc - -$(OBJS)\hhp2cached_hhp2cached.obj : .AUTODEPEND .\hhp2cached.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HHP2CACHED_CXXFLAGS) $< - -$(OBJS)\hhp2cached_hhp2cached.res : .AUTODEPEND .\hhp2cached.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +HHP2CACHED_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) & + $(CXXFLAGS) +HHP2CACHED_OBJECTS = & + $(OBJS)\hhp2cached_hhp2cached.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\hhp2cached.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\hhp2cached.exe del $(OBJS)\hhp2cached.exe + +$(OBJS)\hhp2cached.exe : $(HHP2CACHED_OBJECTS) $(OBJS)\hhp2cached_hhp2cached.res + @%create $(OBJS)\hhp2cached.lbc + @%append $(OBJS)\hhp2cached.lbc option quiet + @%append $(OBJS)\hhp2cached.lbc name $^@ + @%append $(OBJS)\hhp2cached.lbc option caseexact + @%append $(OBJS)\hhp2cached.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(HHP2CACHED_OBJECTS)) do @%append $(OBJS)\hhp2cached.lbc file %i + @for %i in ( $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\hhp2cached.lbc library %i + @%append $(OBJS)\hhp2cached.lbc option resource=$(OBJS)\hhp2cached_hhp2cached.res + @for %i in () do @%append $(OBJS)\hhp2cached.lbc option stack=%i + wlink @$(OBJS)\hhp2cached.lbc + +$(OBJS)\hhp2cached_hhp2cached.obj : .AUTODEPEND .\hhp2cached.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(HHP2CACHED_CXXFLAGS) $< + +$(OBJS)\hhp2cached_hhp2cached.res : .AUTODEPEND .\hhp2cached.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $< + diff --git a/utils/ifacecheck/src/Makefile.in b/utils/ifacecheck/src/Makefile.in index 02a47389e6..399b12137f 100644 --- a/utils/ifacecheck/src/Makefile.in +++ b/utils/ifacecheck/src/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/ifacecheck/src/ifacecheck.dsp b/utils/ifacecheck/src/ifacecheck.dsp index 85290ae7d3..2008857c8e 100644 --- a/utils/ifacecheck/src/ifacecheck.dsp +++ b/utils/ifacecheck/src/ifacecheck.dsp @@ -46,8 +46,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\ifacecheck" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ifacecheck.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ifacecheck.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ifacecheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\ifacecheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe @@ -92,8 +92,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\ifacecheck" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ifacecheck.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ifacecheck.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ifacecheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\ifacecheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe @@ -138,8 +138,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\ifacecheck" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ifacecheck.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ifacecheck.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ifacecheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\ifacecheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe @@ -184,8 +184,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\ifacecheck" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\ifacecheck.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\ifacecheck.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\ifacecheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\ifacecheck.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe diff --git a/utils/ifacecheck/src/ifacecheck_vc7.vcproj b/utils/ifacecheck/src/ifacecheck_vc7.vcproj index 56f88cae08..0e73260958 100644 --- a/utils/ifacecheck/src/ifacecheck_vc7.vcproj +++ b/utils/ifacecheck/src/ifacecheck_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxbase29u_xml.lib wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\ifacecheck.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\ifacecheck.pdb" SubSystem="1" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxbase29u_xml.lib wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\ifacecheck.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\ifacecheck.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxbase29u_xml.lib wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\ifacecheck.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\ifacecheck.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxbase29u_xml.lib wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\ifacecheck.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\ifacecheck.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxbase29u_xml.lib wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\ifacecheck.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\ifacecheck.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxbase29u_xml.lib wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\ifacecheck.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\ifacecheck.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -IFACECHECK_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\ifacecheck.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ - $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_9) \ - $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS) -IFACECHECK_OBJECTS = \ - $(OBJS)\ifacecheck_ifacecheck.obj \ - $(OBJS)\ifacecheck_xmlparser.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_XML_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\ifacecheck.exe - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\ifacecheck.exe del $(OBJS)\ifacecheck.exe - -if exist $(OBJS)\ifacecheck.ilk del $(OBJS)\ifacecheck.ilk - -if exist $(OBJS)\ifacecheck.pdb del $(OBJS)\ifacecheck.pdb - -$(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS) - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\ifacecheck.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< - $(IFACECHECK_OBJECTS) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -$(OBJS)\ifacecheck_ifacecheck.obj: .\ifacecheck.cpp - $(CXX) /c /nologo /TP /Fo$@ $(IFACECHECK_CXXFLAGS) .\ifacecheck.cpp - -$(OBJS)\ifacecheck_xmlparser.obj: .\xmlparser.cpp - $(CXX) /c /nologo /TP /Fo$@ $(IFACECHECK_CXXFLAGS) .\xmlparser.cpp - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +IFACECHECK_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\ifacecheck.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ + /W4 /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +IFACECHECK_OBJECTS = \ + $(OBJS)\ifacecheck_ifacecheck.obj \ + $(OBJS)\ifacecheck_xmlparser.obj + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_XML_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\ifacecheck.exe + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\ifacecheck.exe del $(OBJS)\ifacecheck.exe + -if exist $(OBJS)\ifacecheck.ilk del $(OBJS)\ifacecheck.ilk + -if exist $(OBJS)\ifacecheck.pdb del $(OBJS)\ifacecheck.pdb + +$(OBJS)\ifacecheck.exe: $(IFACECHECK_OBJECTS) + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\ifacecheck.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< + $(IFACECHECK_OBJECTS) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +$(OBJS)\ifacecheck_ifacecheck.obj: .\ifacecheck.cpp + $(CXX) /c /nologo /TP /Fo$@ $(IFACECHECK_CXXFLAGS) .\ifacecheck.cpp + +$(OBJS)\ifacecheck_xmlparser.obj: .\xmlparser.cpp + $(CXX) /c /nologo /TP /Fo$@ $(IFACECHECK_CXXFLAGS) .\xmlparser.cpp + diff --git a/utils/ifacecheck/src/makefile.wat b/utils/ifacecheck/src/makefile.wat index a343e3ef25..82273d5722 100644 --- a/utils/ifacecheck/src/makefile.wat +++ b/utils/ifacecheck/src/makefile.wat @@ -1,249 +1,249 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif -__WXLIB_XML_p = -!ifeq MONOLITHIC 0 -__WXLIB_XML_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -IFACECHECK_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & - $(__DLLFLAG_p) -dwxUSE_GUI=0 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) & - $(CPPFLAGS) $(CXXFLAGS) -IFACECHECK_OBJECTS = & - $(OBJS)\ifacecheck_ifacecheck.obj & - $(OBJS)\ifacecheck_xmlparser.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\ifacecheck.exe - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\ifacecheck.exe del $(OBJS)\ifacecheck.exe - -$(OBJS)\ifacecheck.exe : $(IFACECHECK_OBJECTS) - @%create $(OBJS)\ifacecheck.lbc - @%append $(OBJS)\ifacecheck.lbc option quiet - @%append $(OBJS)\ifacecheck.lbc name $^@ - @%append $(OBJS)\ifacecheck.lbc option caseexact - @%append $(OBJS)\ifacecheck.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) - @for %i in ($(IFACECHECK_OBJECTS)) do @%append $(OBJS)\ifacecheck.lbc file %i - @for %i in ( $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\ifacecheck.lbc library %i - @%append $(OBJS)\ifacecheck.lbc - @for %i in () do @%append $(OBJS)\ifacecheck.lbc option stack=%i - wlink @$(OBJS)\ifacecheck.lbc - -$(OBJS)\ifacecheck_ifacecheck.obj : .AUTODEPEND .\ifacecheck.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(IFACECHECK_CXXFLAGS) $< - -$(OBJS)\ifacecheck_xmlparser.obj : .AUTODEPEND .\xmlparser.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(IFACECHECK_CXXFLAGS) $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__WXLIB_XML_p = +!ifeq MONOLITHIC 0 +__WXLIB_XML_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +IFACECHECK_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & + $(__DLLFLAG_p) -dwxUSE_GUI=0 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) & + $(CPPFLAGS) $(CXXFLAGS) +IFACECHECK_OBJECTS = & + $(OBJS)\ifacecheck_ifacecheck.obj & + $(OBJS)\ifacecheck_xmlparser.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\ifacecheck.exe + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\ifacecheck.exe del $(OBJS)\ifacecheck.exe + +$(OBJS)\ifacecheck.exe : $(IFACECHECK_OBJECTS) + @%create $(OBJS)\ifacecheck.lbc + @%append $(OBJS)\ifacecheck.lbc option quiet + @%append $(OBJS)\ifacecheck.lbc name $^@ + @%append $(OBJS)\ifacecheck.lbc option caseexact + @%append $(OBJS)\ifacecheck.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) + @for %i in ($(IFACECHECK_OBJECTS)) do @%append $(OBJS)\ifacecheck.lbc file %i + @for %i in ( $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\ifacecheck.lbc library %i + @%append $(OBJS)\ifacecheck.lbc + @for %i in () do @%append $(OBJS)\ifacecheck.lbc option stack=%i + wlink @$(OBJS)\ifacecheck.lbc + +$(OBJS)\ifacecheck_ifacecheck.obj : .AUTODEPEND .\ifacecheck.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(IFACECHECK_CXXFLAGS) $< + +$(OBJS)\ifacecheck_xmlparser.obj : .AUTODEPEND .\xmlparser.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(IFACECHECK_CXXFLAGS) $< + diff --git a/utils/makefile.bcc b/utils/makefile.bcc index 26c00bb0db..4490090fb3 100644 --- a/utils/makefile.bcc +++ b/utils/makefile.bcc @@ -1,123 +1,123 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -.autodepend - -!ifndef BCCDIR -!ifndef MAKEDIR -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif -BCCDIR = $(MAKEDIR)\.. -!endif - -!include ../build/msw/config.bcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ - -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \ - -DCPP="$(CPP)" -DSHARED="$(SHARED)" -DWXUNIV="$(WXUNIV)" \ - -DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" -DBUILD="$(BUILD)" \ - -DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \ - -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \ - -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \ - -DUSE_AUI="$(USE_AUI)" -DUSE_RIBBON="$(USE_RIBBON)" \ - -DUSE_PROPGRID="$(USE_PROPGRID)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \ - -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \ - -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \ - -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \ - -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \ - -DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \ - -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \ - -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" - -### Conditionally set variables: ### - - - -### Targets: ### - -all: emulator execmon helpview hhp2cached ifacecheck screenshotgen wxrc - -clean: - -if exist .\*.obj del .\*.obj - -if exist .\*.res del .\*.res - -if exist .\*.csm del .\*.csm - @echo cd emulator\src >emulator.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>emulator.bat - call emulator.bat - @del emulator.bat - @echo cd execmon >execmon.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>execmon.bat - call execmon.bat - @del execmon.bat - @echo cd helpview\src >helpview.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>helpview.bat - call helpview.bat - @del helpview.bat - @echo cd hhp2cached >hhp2cached.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>hhp2cached.bat - call hhp2cached.bat - @del hhp2cached.bat - @echo cd ifacecheck\src >ifacecheck.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>ifacecheck.bat - call ifacecheck.bat - @del ifacecheck.bat - @echo cd screenshotgen\src >screenshotgen.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>screenshotgen.bat - call screenshotgen.bat - @del screenshotgen.bat - @echo cd wxrc >wxrc.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>wxrc.bat - call wxrc.bat - @del wxrc.bat - -emulator: - @echo cd emulator\src >emulator.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>emulator.bat - call emulator.bat - @del emulator.bat - -execmon: - @echo cd execmon >execmon.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>execmon.bat - call execmon.bat - @del execmon.bat - -helpview: - @echo cd helpview\src >helpview.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>helpview.bat - call helpview.bat - @del helpview.bat - -hhp2cached: - @echo cd hhp2cached >hhp2cached.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>hhp2cached.bat - call hhp2cached.bat - @del hhp2cached.bat - -ifacecheck: - @echo cd ifacecheck\src >ifacecheck.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>ifacecheck.bat - call ifacecheck.bat - @del ifacecheck.bat - -screenshotgen: - @echo cd screenshotgen\src >screenshotgen.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>screenshotgen.bat - call screenshotgen.bat - @del screenshotgen.bat - -wxrc: - @echo cd wxrc >wxrc.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>wxrc.bat - call wxrc.bat - @del wxrc.bat - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +.autodepend + +!ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../build/msw/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ + -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \ + -DCPP="$(CPP)" -DSHARED="$(SHARED)" -DWXUNIV="$(WXUNIV)" \ + -DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" -DBUILD="$(BUILD)" \ + -DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \ + -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \ + -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \ + -DUSE_AUI="$(USE_AUI)" -DUSE_RIBBON="$(USE_RIBBON)" \ + -DUSE_PROPGRID="$(USE_PROPGRID)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \ + -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \ + -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \ + -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \ + -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \ + -DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \ + -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \ + -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" + +### Conditionally set variables: ### + + + +### Targets: ### + +all: emulator execmon helpview hhp2cached ifacecheck screenshotgen wxrc + +clean: + -if exist .\*.obj del .\*.obj + -if exist .\*.res del .\*.res + -if exist .\*.csm del .\*.csm + @echo cd emulator\src >emulator.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>emulator.bat + call emulator.bat + @del emulator.bat + @echo cd execmon >execmon.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>execmon.bat + call execmon.bat + @del execmon.bat + @echo cd helpview\src >helpview.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>helpview.bat + call helpview.bat + @del helpview.bat + @echo cd hhp2cached >hhp2cached.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>hhp2cached.bat + call hhp2cached.bat + @del hhp2cached.bat + @echo cd ifacecheck\src >ifacecheck.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>ifacecheck.bat + call ifacecheck.bat + @del ifacecheck.bat + @echo cd screenshotgen\src >screenshotgen.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>screenshotgen.bat + call screenshotgen.bat + @del screenshotgen.bat + @echo cd wxrc >wxrc.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>wxrc.bat + call wxrc.bat + @del wxrc.bat + +emulator: + @echo cd emulator\src >emulator.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>emulator.bat + call emulator.bat + @del emulator.bat + +execmon: + @echo cd execmon >execmon.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>execmon.bat + call execmon.bat + @del execmon.bat + +helpview: + @echo cd helpview\src >helpview.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>helpview.bat + call helpview.bat + @del helpview.bat + +hhp2cached: + @echo cd hhp2cached >hhp2cached.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>hhp2cached.bat + call hhp2cached.bat + @del hhp2cached.bat + +ifacecheck: + @echo cd ifacecheck\src >ifacecheck.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>ifacecheck.bat + call ifacecheck.bat + @del ifacecheck.bat + +screenshotgen: + @echo cd screenshotgen\src >screenshotgen.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>screenshotgen.bat + call screenshotgen.bat + @del screenshotgen.bat + +wxrc: + @echo cd wxrc >wxrc.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>wxrc.bat + call wxrc.bat + @del wxrc.bat + diff --git a/utils/makefile.gcc b/utils/makefile.gcc index 0bad2e09b3..bd36d90dcf 100644 --- a/utils/makefile.gcc +++ b/utils/makefile.gcc @@ -1,80 +1,80 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -include ../build/msw/config.gcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ - LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \ - CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ - LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" WXUNIV="$(WXUNIV)" \ - UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \ - DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \ - MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ - USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \ - USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \ - USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \ - USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ - USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \ - USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \ - OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \ - WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ - CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ - RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)" - -### Conditionally set variables: ### - - - -### Targets: ### - -all: emulator execmon helpview hhp2cached ifacecheck screenshotgen wxrc - -clean: - -if exist .\*.o del .\*.o - -if exist .\*.d del .\*.d - $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C execmon -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C hhp2cached -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C ifacecheck\src -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C screenshotgen\src -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C wxrc -f makefile.gcc $(MAKEARGS) clean - -emulator: - $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) all - -execmon: - $(MAKE) -C execmon -f makefile.gcc $(MAKEARGS) all - -helpview: - $(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) all - -hhp2cached: - $(MAKE) -C hhp2cached -f makefile.gcc $(MAKEARGS) all - -ifacecheck: - $(MAKE) -C ifacecheck\src -f makefile.gcc $(MAKEARGS) all - -screenshotgen: - $(MAKE) -C screenshotgen\src -f makefile.gcc $(MAKEARGS) all - -wxrc: - $(MAKE) -C wxrc -f makefile.gcc $(MAKEARGS) all - -.PHONY: all clean emulator execmon helpview hhp2cached ifacecheck screenshotgen \ - wxrc - - -SHELL := $(COMSPEC) - -# Dependencies tracking: --include ./*.d +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../build/msw/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ + LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \ + CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ + LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" WXUNIV="$(WXUNIV)" \ + UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \ + DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \ + MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ + USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \ + USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \ + USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \ + USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ + USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \ + USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \ + OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \ + WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ + CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ + RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)" + +### Conditionally set variables: ### + + + +### Targets: ### + +all: emulator execmon helpview hhp2cached ifacecheck screenshotgen wxrc + +clean: + -if exist .\*.o del .\*.o + -if exist .\*.d del .\*.d + $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C execmon -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C hhp2cached -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C ifacecheck\src -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C screenshotgen\src -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C wxrc -f makefile.gcc $(MAKEARGS) clean + +emulator: + $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) all + +execmon: + $(MAKE) -C execmon -f makefile.gcc $(MAKEARGS) all + +helpview: + $(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) all + +hhp2cached: + $(MAKE) -C hhp2cached -f makefile.gcc $(MAKEARGS) all + +ifacecheck: + $(MAKE) -C ifacecheck\src -f makefile.gcc $(MAKEARGS) all + +screenshotgen: + $(MAKE) -C screenshotgen\src -f makefile.gcc $(MAKEARGS) all + +wxrc: + $(MAKE) -C wxrc -f makefile.gcc $(MAKEARGS) all + +.PHONY: all clean emulator execmon helpview hhp2cached ifacecheck screenshotgen \ + wxrc + + +SHELL := $(COMSPEC) + +# Dependencies tracking: +-include ./*.d diff --git a/utils/makefile.vc b/utils/makefile.vc index caf069e89d..28fa38a18a 100644 --- a/utils/makefile.vc +++ b/utils/makefile.vc @@ -1,100 +1,100 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include <../build/msw/config.vc> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ - CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \ - WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \ - TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \ - DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \ - MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ - USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \ - USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \ - USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \ - USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ - USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \ - USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \ - OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \ - WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ - CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ - RUNTIME_LIBS="$(RUNTIME_LIBS)" - -### Conditionally set variables: ### - - - -### Targets: ### - -all: sub_emulator sub_execmon sub_helpview sub_hhp2cached sub_ifacecheck sub_screenshotgen sub_wxrc - -clean: - -if exist .\*.obj del .\*.obj - -if exist .\*.res del .\*.res - -if exist .\*.pch del .\*.pch - cd emulator\src - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd execmon - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd helpview\src - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd hhp2cached - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd ifacecheck\src - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd screenshotgen\src - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - cd wxrc - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - -sub_emulator: - cd emulator\src - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_execmon: - cd execmon - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_helpview: - cd helpview\src - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_hhp2cached: - cd hhp2cached - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_ifacecheck: - cd ifacecheck\src - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_screenshotgen: - cd screenshotgen\src - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -sub_wxrc: - cd wxrc - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ + CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \ + WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \ + TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \ + DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \ + MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ + USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \ + USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \ + USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \ + USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ + USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \ + USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \ + OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \ + WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ + CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ + RUNTIME_LIBS="$(RUNTIME_LIBS)" + +### Conditionally set variables: ### + + + +### Targets: ### + +all: sub_emulator sub_execmon sub_helpview sub_hhp2cached sub_ifacecheck sub_screenshotgen sub_wxrc + +clean: + -if exist .\*.obj del .\*.obj + -if exist .\*.res del .\*.res + -if exist .\*.pch del .\*.pch + cd emulator\src + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd execmon + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd helpview\src + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd hhp2cached + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd ifacecheck\src + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd screenshotgen\src + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + cd wxrc + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" + +sub_emulator: + cd emulator\src + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_execmon: + cd execmon + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_helpview: + cd helpview\src + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_hhp2cached: + cd hhp2cached + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_ifacecheck: + cd ifacecheck\src + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_screenshotgen: + cd screenshotgen\src + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + +sub_wxrc: + cd wxrc + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + diff --git a/utils/makefile.wat b/utils/makefile.wat index abc4a3dead..421980d282 100644 --- a/utils/makefile.wat +++ b/utils/makefile.wat @@ -1,120 +1,120 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - - -### Variables: ### - -MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & - CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" & - WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" & - DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" & - MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" & - USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" & - USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" & - USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" & - USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" & - USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" & - USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" & - OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" & - WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" & - CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" & - RUNTIME_LIBS="$(RUNTIME_LIBS)" - - -### Targets: ### - -all : .SYMBOLIC emulator execmon helpview hhp2cached ifacecheck screenshotgen wxrc - -clean : .SYMBOLIC - -if exist .\*.obj del .\*.obj - -if exist .\*.res del .\*.res - -if exist .\*.lbc del .\*.lbc - -if exist .\*.ilk del .\*.ilk - -if exist .\*.pch del .\*.pch - cd emulator\src - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd execmon - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd helpview\src - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd hhp2cached - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd ifacecheck\src - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd screenshotgen\src - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - cd wxrc - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - -emulator : .SYMBOLIC - cd emulator\src - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -execmon : .SYMBOLIC - cd execmon - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -helpview : .SYMBOLIC - cd helpview\src - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -hhp2cached : .SYMBOLIC - cd hhp2cached - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -ifacecheck : .SYMBOLIC - cd ifacecheck\src - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -screenshotgen : .SYMBOLIC - cd screenshotgen\src - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -wxrc : .SYMBOLIC - cd wxrc - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + + +### Variables: ### + +MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & + CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" & + WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" BUILD="$(BUILD)" & + DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" & + MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" & + USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" & + USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" & + USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" & + USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" & + USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" & + USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" & + OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" & + WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" & + CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" & + RUNTIME_LIBS="$(RUNTIME_LIBS)" + + +### Targets: ### + +all : .SYMBOLIC emulator execmon helpview hhp2cached ifacecheck screenshotgen wxrc + +clean : .SYMBOLIC + -if exist .\*.obj del .\*.obj + -if exist .\*.res del .\*.res + -if exist .\*.lbc del .\*.lbc + -if exist .\*.ilk del .\*.ilk + -if exist .\*.pch del .\*.pch + cd emulator\src + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd execmon + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd helpview\src + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd hhp2cached + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd ifacecheck\src + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd screenshotgen\src + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + cd wxrc + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) + +emulator : .SYMBOLIC + cd emulator\src + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +execmon : .SYMBOLIC + cd execmon + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +helpview : .SYMBOLIC + cd helpview\src + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +hhp2cached : .SYMBOLIC + cd hhp2cached + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +ifacecheck : .SYMBOLIC + cd ifacecheck\src + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +screenshotgen : .SYMBOLIC + cd screenshotgen\src + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + +wxrc : .SYMBOLIC + cd wxrc + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + diff --git a/utils/screenshotgen/src/Makefile.in b/utils/screenshotgen/src/Makefile.in index b43680d997..091cff985c 100644 --- a/utils/screenshotgen/src/Makefile.in +++ b/utils/screenshotgen/src/Makefile.in @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) +# Bakefile 0.2.7 (http://www.bakefile.org) # Do not modify, all changes will be overwritten! # ========================================================================= diff --git a/utils/screenshotgen/src/makefile.bcc b/utils/screenshotgen/src/makefile.bcc index 207e9c31d3..9652c84124 100644 --- a/utils/screenshotgen/src/makefile.bcc +++ b/utils/screenshotgen/src/makefile.bcc @@ -1,276 +1,276 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -.autodepend - -!ifndef BCCDIR -!ifndef MAKEDIR -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif -BCCDIR = $(MAKEDIR)\.. -!endif - -!include ../../../build/msw/config.bcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = bcc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SCREENSHOTGEN_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include \ - $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include \ - -I. $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS) -SCREENSHOTGEN_OBJECTS = \ - $(OBJS)\screenshotgen_screenshot_app.obj \ - $(OBJS)\screenshotgen_screenshot_main.obj \ - $(OBJS)\screenshotgen_guiframe.obj \ - $(OBJS)\screenshotgen_customcombo.obj \ - $(OBJS)\screenshotgen_autocapture.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_2 = -Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_2 = -O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_5 = -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_5 = mt -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_6 = -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_6 = -tWM -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_7 = -tWR -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_7 = -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = i -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = -DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = -dwxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = -DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = -dwxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = -D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = -d_UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = -DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = -dWXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_AUI_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_ADV_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_RICHTEXT_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_HTML_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_XML_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = -v -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = -v- -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO = -v- -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO = -v -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\screenshotgen.exe bitmaps xml - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.csm del $(OBJS)\*.csm - -if exist $(OBJS)\screenshotgen.exe del $(OBJS)\screenshotgen.exe - -if exist $(OBJS)\screenshotgen.tds del $(OBJS)\screenshotgen.tds - -if exist $(OBJS)\screenshotgen.ilc del $(OBJS)\screenshotgen.ilc - -if exist $(OBJS)\screenshotgen.ild del $(OBJS)\screenshotgen.ild - -if exist $(OBJS)\screenshotgen.ilf del $(OBJS)\screenshotgen.ilf - -if exist $(OBJS)\screenshotgen.ils del $(OBJS)\screenshotgen.ils - -$(OBJS)\screenshotgen.exe: $(SCREENSHOTGEN_OBJECTS) $(OBJS)\screenshotgen_screenshotgen.res - ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| - c0w32.obj $(SCREENSHOTGEN_OBJECTS),$@,, $(__WXLIB_AUI_p) $(__WXLIB_ADV_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\screenshotgen_screenshotgen.res -| - -bitmaps: - if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps - for %f in (wxwin32x32.png bell.png sound.png dropbuth.png dropbutn.png dropbutp.png throbber.gif) do if not exist $(OBJS)\bitmaps\%f copy .\bitmaps\%f $(OBJS)\bitmaps - -xml: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (richtext.xml) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\screenshotgen_screenshot_app.obj: .\screenshot_app.cpp - $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_app.cpp - -$(OBJS)\screenshotgen_screenshot_main.obj: .\screenshot_main.cpp - $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_main.cpp - -$(OBJS)\screenshotgen_guiframe.obj: .\guiframe.cpp - $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\guiframe.cpp - -$(OBJS)\screenshotgen_customcombo.obj: .\customcombo.cpp - $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\customcombo.cpp - -$(OBJS)\screenshotgen_autocapture.obj: .\autocapture.cpp - $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\autocapture.cpp - -$(OBJS)\screenshotgen_screenshotgen.res: .\screenshotgen.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\screenshotgen.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +.autodepend + +!ifndef BCCDIR +!ifndef MAKEDIR +!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 +!endif +BCCDIR = $(MAKEDIR)\.. +!endif + +!include ../../../build/msw/config.bcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = bcc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +SCREENSHOTGEN_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include \ + $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include \ + -I. $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS) +SCREENSHOTGEN_OBJECTS = \ + $(OBJS)\screenshotgen_screenshot_app.obj \ + $(OBJS)\screenshotgen_screenshot_main.obj \ + $(OBJS)\screenshotgen_guiframe.obj \ + $(OBJS)\screenshotgen_customcombo.obj \ + $(OBJS)\screenshotgen_autocapture.obj + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_2 = -Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_2 = -O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_5 = +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_5 = mt +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_6 = +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_6 = -tWM +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_7 = -tWR +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_7 = +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_8 = i +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_8 = +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = -DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = -dwxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = -DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = -dwxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = -D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = -d_UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = -dWXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_AUI_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_ADV_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_RICHTEXT_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_XML_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO = -v- +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO = -v +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\screenshotgen.exe bitmaps xml + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.csm del $(OBJS)\*.csm + -if exist $(OBJS)\screenshotgen.exe del $(OBJS)\screenshotgen.exe + -if exist $(OBJS)\screenshotgen.tds del $(OBJS)\screenshotgen.tds + -if exist $(OBJS)\screenshotgen.ilc del $(OBJS)\screenshotgen.ilc + -if exist $(OBJS)\screenshotgen.ild del $(OBJS)\screenshotgen.ild + -if exist $(OBJS)\screenshotgen.ilf del $(OBJS)\screenshotgen.ilf + -if exist $(OBJS)\screenshotgen.ils del $(OBJS)\screenshotgen.ils + +$(OBJS)\screenshotgen.exe: $(SCREENSHOTGEN_OBJECTS) $(OBJS)\screenshotgen_screenshotgen.res + ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&| + c0w32.obj $(SCREENSHOTGEN_OBJECTS),$@,, $(__WXLIB_AUI_p) $(__WXLIB_ADV_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\screenshotgen_screenshotgen.res +| + +bitmaps: + if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps + for %f in (wxwin32x32.png bell.png sound.png dropbuth.png dropbutn.png dropbutp.png throbber.gif) do if not exist $(OBJS)\bitmaps\%f copy .\bitmaps\%f $(OBJS)\bitmaps + +xml: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (richtext.xml) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\screenshotgen_screenshot_app.obj: .\screenshot_app.cpp + $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_app.cpp + +$(OBJS)\screenshotgen_screenshot_main.obj: .\screenshot_main.cpp + $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_main.cpp + +$(OBJS)\screenshotgen_guiframe.obj: .\guiframe.cpp + $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\guiframe.cpp + +$(OBJS)\screenshotgen_customcombo.obj: .\customcombo.cpp + $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\customcombo.cpp + +$(OBJS)\screenshotgen_autocapture.obj: .\autocapture.cpp + $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\autocapture.cpp + +$(OBJS)\screenshotgen_screenshotgen.res: .\screenshotgen.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -dNOPCH .\screenshotgen.rc + diff --git a/utils/screenshotgen/src/makefile.gcc b/utils/screenshotgen/src/makefile.gcc index ca618d571b..0ec62be655 100644 --- a/utils/screenshotgen/src/makefile.gcc +++ b/utils/screenshotgen/src/makefile.gcc @@ -1,270 +1,270 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -include ../../../build/msw/config.gcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -CPPDEPS = -MT$@ -MF$@.d -MD -MP -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = gcc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SCREENSHOTGEN_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \ - $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \ - $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) -SCREENSHOTGEN_OBJECTS = \ - $(OBJS)\screenshotgen_screenshot_app.o \ - $(OBJS)\screenshotgen_screenshot_main.o \ - $(OBJS)\screenshotgen_guiframe.o \ - $(OBJS)\screenshotgen_customcombo.o \ - $(OBJS)\screenshotgen_autocapture.o \ - $(OBJS)\screenshotgen_screenshotgen_rc.o - -### Conditionally set variables: ### - -ifeq ($(GCC_VERSION),2.95) -GCCFLAGS = -fvtable-thunks -endif -ifeq ($(USE_GUI),0) -PORTNAME = base -endif -ifeq ($(USE_GUI),1) -PORTNAME = msw -endif -ifeq ($(BUILD),debug) -WXDEBUGFLAG = d -endif -ifeq ($(UNICODE),1) -WXUNICODEFLAG = u -endif -ifeq ($(WXUNIV),1) -WXUNIVNAME = univ -endif -ifeq ($(SHARED),1) -WXDLLFLAG = dll -endif -ifeq ($(SHARED),0) -LIBTYPE_SUFFIX = lib -endif -ifeq ($(SHARED),1) -LIBTYPE_SUFFIX = dll -endif -ifeq ($(MONOLITHIC),0) -EXTRALIBS_FOR_BASE = -endif -ifeq ($(MONOLITHIC),1) -EXTRALIBS_FOR_BASE = -endif -ifeq ($(BUILD),debug) -__OPTIMIZEFLAG_2 = -O0 -endif -ifeq ($(BUILD),release) -__OPTIMIZEFLAG_2 = -O2 -endif -ifeq ($(USE_RTTI),0) -__RTTIFLAG_5 = -fno-rtti -endif -ifeq ($(USE_RTTI),1) -__RTTIFLAG_5 = -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONSFLAG_6 = -fno-exceptions -endif -ifeq ($(USE_EXCEPTIONS),1) -__EXCEPTIONSFLAG_6 = -endif -ifeq ($(WXUNIV),1) -__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -endif -ifeq ($(WXUNIV),1) -__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ -endif -ifeq ($(DEBUG_FLAG),0) -__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -endif -ifeq ($(DEBUG_FLAG),0) -__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS -endif -ifeq ($(USE_RTTI),0) -__RTTI_DEFINE_p = -DwxNO_RTTI -endif -ifeq ($(USE_RTTI),0) -__RTTI_DEFINE_p_1 = --define wxNO_RTTI -endif -ifeq ($(USE_THREADS),0) -__THREAD_DEFINE_p = -DwxNO_THREADS -endif -ifeq ($(USE_THREADS),0) -__THREAD_DEFINE_p_1 = --define wxNO_THREADS -endif -ifeq ($(UNICODE),0) -__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 -endif -ifeq ($(UNICODE),1) -__UNICODE_DEFINE_p = -D_UNICODE -endif -ifeq ($(UNICODE),0) -__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0 -endif -ifeq ($(UNICODE),1) -__UNICODE_DEFINE_p_1 = --define _UNICODE -endif -ifeq ($(MSLU),1) -__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 -endif -ifeq ($(MSLU),1) -__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1 -endif -ifeq ($(USE_GDIPLUS),1) -__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1 -endif -ifeq ($(USE_GDIPLUS),1) -__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1 -endif -ifeq ($(SHARED),1) -__DLLFLAG_p = -DWXUSINGDLL -endif -ifeq ($(SHARED),1) -__DLLFLAG_p_1 = --define WXUSINGDLL -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_AUI_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_ADV_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_RICHTEXT_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_HTML_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_XML_p = \ - -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_CORE_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core -endif -ifeq ($(MONOLITHIC),0) -__WXLIB_BASE_p = \ - -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -endif -ifeq ($(MONOLITHIC),1) -__WXLIB_MONO_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -endif -ifeq ($(USE_GUI),1) -__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -endif -ifeq ($(USE_GUI),1) -__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -endif -ifeq ($(USE_GUI),1) -__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -endif -ifeq ($(MSLU),1) -__UNICOWS_LIB_p = -lunicows -endif -ifeq ($(USE_GDIPLUS),1) -__GDIPLUS_LIB_p = -lgdiplus -endif -ifeq ($(BUILD),debug) -ifeq ($(DEBUG_INFO),default) -__DEBUGINFO = -g -endif -endif -ifeq ($(BUILD),release) -ifeq ($(DEBUG_INFO),default) -__DEBUGINFO = -endif -endif -ifeq ($(DEBUG_INFO),0) -__DEBUGINFO = -endif -ifeq ($(DEBUG_INFO),1) -__DEBUGINFO = -g -endif -ifeq ($(USE_THREADS),0) -__THREADSFLAG = -endif -ifeq ($(USE_THREADS),1) -__THREADSFLAG = -mthreads -endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\screenshotgen.exe bitmaps xml - -clean: - -if exist $(OBJS)\*.o del $(OBJS)\*.o - -if exist $(OBJS)\*.d del $(OBJS)\*.d - -if exist $(OBJS)\screenshotgen.exe del $(OBJS)\screenshotgen.exe - -$(OBJS)\screenshotgen.exe: $(SCREENSHOTGEN_OBJECTS) $(OBJS)\screenshotgen_screenshotgen_rc.o - $(CXX) -o $@ $(SCREENSHOTGEN_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_AUI_p) $(__WXLIB_ADV_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet - -bitmaps: - if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps - for %%f in (wxwin32x32.png bell.png sound.png dropbuth.png dropbutn.png dropbutp.png throbber.gif) do if not exist $(OBJS)\bitmaps\%%f copy .\bitmaps\%%f $(OBJS)\bitmaps - -xml: - if not exist $(OBJS) mkdir $(OBJS) - for %%f in (richtext.xml) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) - -$(OBJS)\screenshotgen_screenshot_app.o: ./screenshot_app.cpp - $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\screenshotgen_screenshot_main.o: ./screenshot_main.cpp - $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\screenshotgen_guiframe.o: ./guiframe.cpp - $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\screenshotgen_customcombo.o: ./customcombo.cpp - $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\screenshotgen_autocapture.o: ./autocapture.cpp - $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\screenshotgen_screenshotgen_rc.o: ./screenshotgen.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH - -.PHONY: all clean bitmaps xml - - -SHELL := $(COMSPEC) - -# Dependencies tracking: --include $(OBJS)/*.d +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +include ../../../build/msw/config.gcc + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +CPPDEPS = -MT$@ -MF$@.d -MD -MP +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = gcc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +SCREENSHOTGEN_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ + $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\..\include -W -Wall -I. \ + $(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__RTTIFLAG_5) \ + $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) +SCREENSHOTGEN_OBJECTS = \ + $(OBJS)\screenshotgen_screenshot_app.o \ + $(OBJS)\screenshotgen_screenshot_main.o \ + $(OBJS)\screenshotgen_guiframe.o \ + $(OBJS)\screenshotgen_customcombo.o \ + $(OBJS)\screenshotgen_autocapture.o \ + $(OBJS)\screenshotgen_screenshotgen_rc.o + +### Conditionally set variables: ### + +ifeq ($(GCC_VERSION),2.95) +GCCFLAGS = -fvtable-thunks +endif +ifeq ($(USE_GUI),0) +PORTNAME = base +endif +ifeq ($(USE_GUI),1) +PORTNAME = msw +endif +ifeq ($(BUILD),debug) +WXDEBUGFLAG = d +endif +ifeq ($(UNICODE),1) +WXUNICODEFLAG = u +endif +ifeq ($(WXUNIV),1) +WXUNIVNAME = univ +endif +ifeq ($(SHARED),1) +WXDLLFLAG = dll +endif +ifeq ($(SHARED),0) +LIBTYPE_SUFFIX = lib +endif +ifeq ($(SHARED),1) +LIBTYPE_SUFFIX = dll +endif +ifeq ($(MONOLITHIC),0) +EXTRALIBS_FOR_BASE = +endif +ifeq ($(MONOLITHIC),1) +EXTRALIBS_FOR_BASE = +endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG_2 = -O0 +endif +ifeq ($(BUILD),release) +__OPTIMIZEFLAG_2 = -O2 +endif +ifeq ($(USE_RTTI),0) +__RTTIFLAG_5 = -fno-rtti +endif +ifeq ($(USE_RTTI),1) +__RTTIFLAG_5 = +endif +ifeq ($(USE_EXCEPTIONS),0) +__EXCEPTIONSFLAG_6 = -fno-exceptions +endif +ifeq ($(USE_EXCEPTIONS),1) +__EXCEPTIONSFLAG_6 = +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ +endif +ifeq ($(DEBUG_FLAG),0) +__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 +endif +ifeq ($(DEBUG_FLAG),0) +__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0 +endif +ifeq ($(USE_EXCEPTIONS),0) +__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS +endif +ifeq ($(USE_EXCEPTIONS),0) +__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS +endif +ifeq ($(USE_RTTI),0) +__RTTI_DEFINE_p = -DwxNO_RTTI +endif +ifeq ($(USE_RTTI),0) +__RTTI_DEFINE_p_1 = --define wxNO_RTTI +endif +ifeq ($(USE_THREADS),0) +__THREAD_DEFINE_p = -DwxNO_THREADS +endif +ifeq ($(USE_THREADS),0) +__THREAD_DEFINE_p_1 = --define wxNO_THREADS +endif +ifeq ($(UNICODE),0) +__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p = -D_UNICODE +endif +ifeq ($(UNICODE),0) +__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0 +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p_1 = --define _UNICODE +endif +ifeq ($(MSLU),1) +__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 +endif +ifeq ($(MSLU),1) +__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1 +endif +ifeq ($(USE_GDIPLUS),1) +__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1 +endif +ifeq ($(USE_GDIPLUS),1) +__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1 +endif +ifeq ($(SHARED),1) +__DLLFLAG_p = -DWXUSINGDLL +endif +ifeq ($(SHARED),1) +__DLLFLAG_p_1 = --define WXUSINGDLL +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_AUI_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_ADV_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_RICHTEXT_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_HTML_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_XML_p = \ + -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_BASE_p = \ + -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) +endif +ifeq ($(MONOLITHIC),1) +__WXLIB_MONO_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) +endif +ifeq ($(USE_GUI),1) +__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) +endif +ifeq ($(USE_GUI),1) +__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) +endif +ifeq ($(MSLU),1) +__UNICOWS_LIB_p = -lunicows +endif +ifeq ($(USE_GDIPLUS),1) +__GDIPLUS_LIB_p = -lgdiplus +endif +ifeq ($(BUILD),debug) +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = -g +endif +endif +ifeq ($(BUILD),release) +ifeq ($(DEBUG_INFO),default) +__DEBUGINFO = +endif +endif +ifeq ($(DEBUG_INFO),0) +__DEBUGINFO = +endif +ifeq ($(DEBUG_INFO),1) +__DEBUGINFO = -g +endif +ifeq ($(USE_THREADS),0) +__THREADSFLAG = +endif +ifeq ($(USE_THREADS),1) +__THREADSFLAG = -mthreads +endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\screenshotgen.exe bitmaps xml + +clean: + -if exist $(OBJS)\*.o del $(OBJS)\*.o + -if exist $(OBJS)\*.d del $(OBJS)\*.d + -if exist $(OBJS)\screenshotgen.exe del $(OBJS)\screenshotgen.exe + +$(OBJS)\screenshotgen.exe: $(SCREENSHOTGEN_OBJECTS) $(OBJS)\screenshotgen_screenshotgen_rc.o + $(CXX) -o $@ $(SCREENSHOTGEN_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) $(__WXLIB_AUI_p) $(__WXLIB_ADV_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet + +bitmaps: + if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps + for %%f in (wxwin32x32.png bell.png sound.png dropbuth.png dropbutn.png dropbutp.png throbber.gif) do if not exist $(OBJS)\bitmaps\%%f copy .\bitmaps\%%f $(OBJS)\bitmaps + +xml: + if not exist $(OBJS) mkdir $(OBJS) + for %%f in (richtext.xml) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) + +$(OBJS)\screenshotgen_screenshot_app.o: ./screenshot_app.cpp + $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\screenshotgen_screenshot_main.o: ./screenshot_main.cpp + $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\screenshotgen_guiframe.o: ./guiframe.cpp + $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\screenshotgen_customcombo.o: ./customcombo.cpp + $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\screenshotgen_autocapture.o: ./autocapture.cpp + $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $< + +$(OBJS)\screenshotgen_screenshotgen_rc.o: ./screenshotgen.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH + +.PHONY: all clean bitmaps xml + + +SHELL := $(COMSPEC) + +# Dependencies tracking: +-include $(OBJS)/*.d diff --git a/utils/screenshotgen/src/makefile.vc b/utils/screenshotgen/src/makefile.vc index c6a2767ba7..3f46150dbb 100644 --- a/utils/screenshotgen/src/makefile.vc +++ b/utils/screenshotgen/src/makefile.vc @@ -1,355 +1,380 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include <../../../build/msw/config.vc> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SCREENSHOTGEN_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\screenshotgen.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include /W4 /I. \ - $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH $(__RTTIFLAG_9) \ - $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) $(CXXFLAGS) -SCREENSHOTGEN_OBJECTS = \ - $(OBJS)\screenshotgen_screenshot_app.obj \ - $(OBJS)\screenshotgen_screenshot_main.obj \ - $(OBJS)\screenshotgen_guiframe.obj \ - $(OBJS)\screenshotgen_customcombo.obj \ - $(OBJS)\screenshotgen_autocapture.obj \ - $(OBJS)\screenshotgen_screenshotgen.res - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p_1 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p_1 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_1 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_1 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_1 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p_1 = /d WXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_AUI_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_ADV_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_RICHTEXT_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_HTML_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_XML_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(OBJS)\screenshotgen.exe bitmaps xml - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\screenshotgen.exe del $(OBJS)\screenshotgen.exe - -if exist $(OBJS)\screenshotgen.ilk del $(OBJS)\screenshotgen.ilk - -if exist $(OBJS)\screenshotgen.pdb del $(OBJS)\screenshotgen.pdb - -$(OBJS)\screenshotgen.exe: $(SCREENSHOTGEN_OBJECTS) $(OBJS)\screenshotgen_screenshotgen.res - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\screenshotgen.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< - $(SCREENSHOTGEN_OBJECTS) $(__WXLIB_AUI_p) $(__WXLIB_ADV_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< - -bitmaps: - if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps - for %f in (wxwin32x32.png bell.png sound.png dropbuth.png dropbutn.png dropbutp.png throbber.gif) do if not exist $(OBJS)\bitmaps\%f copy .\bitmaps\%f $(OBJS)\bitmaps - -xml: - if not exist $(OBJS) mkdir $(OBJS) - for %f in (richtext.xml) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\screenshotgen_screenshot_app.obj: .\screenshot_app.cpp - $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_app.cpp - -$(OBJS)\screenshotgen_screenshot_main.obj: .\screenshot_main.cpp - $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_main.cpp - -$(OBJS)\screenshotgen_guiframe.obj: .\guiframe.cpp - $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\guiframe.cpp - -$(OBJS)\screenshotgen_customcombo.obj: .\customcombo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\customcombo.cpp - -$(OBJS)\screenshotgen_autocapture.obj: .\autocapture.cpp - $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\autocapture.cpp - -$(OBJS)\screenshotgen_screenshotgen.res: .\screenshotgen.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\screenshotgen.rc - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +SCREENSHOTGEN_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\screenshotgen.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\..\include \ + /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\samples /DNOPCH \ + $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +SCREENSHOTGEN_OBJECTS = \ + $(OBJS)\screenshotgen_screenshot_app.obj \ + $(OBJS)\screenshotgen_screenshot_main.obj \ + $(OBJS)\screenshotgen_guiframe.obj \ + $(OBJS)\screenshotgen_customcombo.obj \ + $(OBJS)\screenshotgen_autocapture.obj +SCREENSHOTGEN_RESOURCES = \ + $(OBJS)\screenshotgen_screenshotgen.res + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p_1 = /d _DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p_1 = /d wxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p_1 = /d wxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_1 = /d _UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p_1 = /d wxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_1 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_AUI_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_ADV_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_RICHTEXT_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_HTML_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_XML_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +!if "$(USE_GUI)" == "1" +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(OBJS)\screenshotgen.exe bitmaps xml + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\screenshotgen.exe del $(OBJS)\screenshotgen.exe + -if exist $(OBJS)\screenshotgen.ilk del $(OBJS)\screenshotgen.ilk + -if exist $(OBJS)\screenshotgen.pdb del $(OBJS)\screenshotgen.pdb + +$(OBJS)\screenshotgen.exe: $(SCREENSHOTGEN_OBJECTS) $(OBJS)\screenshotgen_screenshotgen.res + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\screenshotgen.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<< + $(SCREENSHOTGEN_OBJECTS) $(SCREENSHOTGEN_RESOURCES) $(__WXLIB_AUI_p) $(__WXLIB_ADV_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< + +bitmaps: + if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps + for %f in (wxwin32x32.png bell.png sound.png dropbuth.png dropbutn.png dropbutp.png throbber.gif) do if not exist $(OBJS)\bitmaps\%f copy .\bitmaps\%f $(OBJS)\bitmaps + +xml: + if not exist $(OBJS) mkdir $(OBJS) + for %f in (richtext.xml) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\screenshotgen_screenshot_app.obj: .\screenshot_app.cpp + $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_app.cpp + +$(OBJS)\screenshotgen_screenshot_main.obj: .\screenshot_main.cpp + $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_main.cpp + +$(OBJS)\screenshotgen_guiframe.obj: .\guiframe.cpp + $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\guiframe.cpp + +$(OBJS)\screenshotgen_customcombo.obj: .\customcombo.cpp + $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\customcombo.cpp + +$(OBJS)\screenshotgen_autocapture.obj: .\autocapture.cpp + $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\autocapture.cpp + +$(OBJS)\screenshotgen_screenshotgen.res: .\screenshotgen.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\..\include /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\samples /d NOPCH .\screenshotgen.rc + diff --git a/utils/screenshotgen/src/makefile.wat b/utils/screenshotgen/src/makefile.wat index 26222e1f51..74a5675088 100644 --- a/utils/screenshotgen/src/makefile.wat +++ b/utils/screenshotgen/src/makefile.wat @@ -1,309 +1,309 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXLIB_AUI_p = -!ifeq MONOLITHIC 0 -__WXLIB_AUI_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib -!endif -__WXLIB_ADV_p = -!ifeq MONOLITHIC 0 -__WXLIB_ADV_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -__WXLIB_RICHTEXT_p = -!ifeq MONOLITHIC 0 -__WXLIB_RICHTEXT_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib -!endif -__WXLIB_HTML_p = -!ifeq MONOLITHIC 0 -__WXLIB_HTML_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -__WXLIB_XML_p = -!ifeq MONOLITHIC 0 -__WXLIB_XML_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib -!endif -__WXLIB_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIB_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -SCREENSHOTGEN_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) & - $(__THREADSFLAG_5) $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) & - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & - -i=$(SETUPHDIR) -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & - $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) -SCREENSHOTGEN_OBJECTS = & - $(OBJS)\screenshotgen_screenshot_app.obj & - $(OBJS)\screenshotgen_screenshot_main.obj & - $(OBJS)\screenshotgen_guiframe.obj & - $(OBJS)\screenshotgen_customcombo.obj & - $(OBJS)\screenshotgen_autocapture.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(OBJS)\screenshotgen.exe bitmaps xml - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\screenshotgen.exe del $(OBJS)\screenshotgen.exe - -$(OBJS)\screenshotgen.exe : $(SCREENSHOTGEN_OBJECTS) $(OBJS)\screenshotgen_screenshotgen.res - @%create $(OBJS)\screenshotgen.lbc - @%append $(OBJS)\screenshotgen.lbc option quiet - @%append $(OBJS)\screenshotgen.lbc name $^@ - @%append $(OBJS)\screenshotgen.lbc option caseexact - @%append $(OBJS)\screenshotgen.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) - @for %i in ($(SCREENSHOTGEN_OBJECTS)) do @%append $(OBJS)\screenshotgen.lbc file %i - @for %i in ( $(__WXLIB_AUI_p) $(__WXLIB_ADV_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\screenshotgen.lbc library %i - @%append $(OBJS)\screenshotgen.lbc option resource=$(OBJS)\screenshotgen_screenshotgen.res - @for %i in () do @%append $(OBJS)\screenshotgen.lbc option stack=%i - wlink @$(OBJS)\screenshotgen.lbc - -bitmaps : .SYMBOLIC - if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps - for %f in (wxwin32x32.png bell.png sound.png dropbuth.png dropbutn.png dropbutp.png throbber.gif) do if not exist $(OBJS)\bitmaps\%f copy .\bitmaps\%f $(OBJS)\bitmaps - -xml : .SYMBOLIC - if not exist $(OBJS) mkdir $(OBJS) - for %f in (richtext.xml) do if not exist $(OBJS)\%f copy .\%f $(OBJS) - -$(OBJS)\screenshotgen_screenshot_app.obj : .AUTODEPEND .\screenshot_app.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(SCREENSHOTGEN_CXXFLAGS) $< - -$(OBJS)\screenshotgen_screenshot_main.obj : .AUTODEPEND .\screenshot_main.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(SCREENSHOTGEN_CXXFLAGS) $< - -$(OBJS)\screenshotgen_guiframe.obj : .AUTODEPEND .\guiframe.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(SCREENSHOTGEN_CXXFLAGS) $< - -$(OBJS)\screenshotgen_customcombo.obj : .AUTODEPEND .\customcombo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(SCREENSHOTGEN_CXXFLAGS) $< - -$(OBJS)\screenshotgen_autocapture.obj : .AUTODEPEND .\autocapture.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(SCREENSHOTGEN_CXXFLAGS) $< - -$(OBJS)\screenshotgen_screenshotgen.res : .AUTODEPEND .\screenshotgen.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXLIB_AUI_p = +!ifeq MONOLITHIC 0 +__WXLIB_AUI_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib +!endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +!endif +__WXLIB_RICHTEXT_p = +!ifeq MONOLITHIC 0 +__WXLIB_RICHTEXT_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib +!endif +__WXLIB_HTML_p = +!ifeq MONOLITHIC 0 +__WXLIB_HTML_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +!endif +__WXLIB_XML_p = +!ifeq MONOLITHIC 0 +__WXLIB_XML_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib +!endif +__WXLIB_CORE_p = +!ifeq MONOLITHIC 0 +__WXLIB_CORE_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__LIB_TIFF_p = +!ifeq USE_GUI 1 +__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib +!endif +__LIB_JPEG_p = +!ifeq USE_GUI 1 +__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib +!endif +__LIB_PNG_p = +!ifeq USE_GUI 1 +__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +SCREENSHOTGEN_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) & + $(__THREADSFLAG_5) $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) & + $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) & + -i=$(SETUPHDIR) -i=.\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & + -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $(__RTTIFLAG_7) & + $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) +SCREENSHOTGEN_OBJECTS = & + $(OBJS)\screenshotgen_screenshot_app.obj & + $(OBJS)\screenshotgen_screenshot_main.obj & + $(OBJS)\screenshotgen_guiframe.obj & + $(OBJS)\screenshotgen_customcombo.obj & + $(OBJS)\screenshotgen_autocapture.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(OBJS)\screenshotgen.exe bitmaps xml + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\screenshotgen.exe del $(OBJS)\screenshotgen.exe + +$(OBJS)\screenshotgen.exe : $(SCREENSHOTGEN_OBJECTS) $(OBJS)\screenshotgen_screenshotgen.res + @%create $(OBJS)\screenshotgen.lbc + @%append $(OBJS)\screenshotgen.lbc option quiet + @%append $(OBJS)\screenshotgen.lbc name $^@ + @%append $(OBJS)\screenshotgen.lbc option caseexact + @%append $(OBJS)\screenshotgen.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS) + @for %i in ($(SCREENSHOTGEN_OBJECTS)) do @%append $(OBJS)\screenshotgen.lbc file %i + @for %i in ( $(__WXLIB_AUI_p) $(__WXLIB_ADV_p) $(__WXLIB_RICHTEXT_p) $(__WXLIB_HTML_p) $(__WXLIB_XML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\screenshotgen.lbc library %i + @%append $(OBJS)\screenshotgen.lbc option resource=$(OBJS)\screenshotgen_screenshotgen.res + @for %i in () do @%append $(OBJS)\screenshotgen.lbc option stack=%i + wlink @$(OBJS)\screenshotgen.lbc + +bitmaps : .SYMBOLIC + if not exist $(OBJS)\bitmaps mkdir $(OBJS)\bitmaps + for %f in (wxwin32x32.png bell.png sound.png dropbuth.png dropbutn.png dropbutp.png throbber.gif) do if not exist $(OBJS)\bitmaps\%f copy .\bitmaps\%f $(OBJS)\bitmaps + +xml : .SYMBOLIC + if not exist $(OBJS) mkdir $(OBJS) + for %f in (richtext.xml) do if not exist $(OBJS)\%f copy .\%f $(OBJS) + +$(OBJS)\screenshotgen_screenshot_app.obj : .AUTODEPEND .\screenshot_app.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(SCREENSHOTGEN_CXXFLAGS) $< + +$(OBJS)\screenshotgen_screenshot_main.obj : .AUTODEPEND .\screenshot_main.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(SCREENSHOTGEN_CXXFLAGS) $< + +$(OBJS)\screenshotgen_guiframe.obj : .AUTODEPEND .\guiframe.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(SCREENSHOTGEN_CXXFLAGS) $< + +$(OBJS)\screenshotgen_customcombo.obj : .AUTODEPEND .\customcombo.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(SCREENSHOTGEN_CXXFLAGS) $< + +$(OBJS)\screenshotgen_autocapture.obj : .AUTODEPEND .\autocapture.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(SCREENSHOTGEN_CXXFLAGS) $< + +$(OBJS)\screenshotgen_screenshotgen.res : .AUTODEPEND .\screenshotgen.rc + wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH $< + diff --git a/utils/screenshotgen/src/screenshotgen.dsp b/utils/screenshotgen/src/screenshotgen.dsp index 923d3b8ce7..e94e2a9663 100644 --- a/utils/screenshotgen/src/screenshotgen.dsp +++ b/utils/screenshotgen/src/screenshotgen.dsp @@ -47,8 +47,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\screenshotgen" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\screenshotgen.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\screenshotgen.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\screenshotgen.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\screenshotgen.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswunivu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -97,8 +97,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\screenshotgen" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\screenshotgen.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\screenshotgen.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\screenshotgen.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\screenshotgen.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_dll\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_dll\mswu" /i ".\..\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -147,8 +147,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\screenshotgen" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\screenshotgen.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\screenshotgen.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\screenshotgen.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\screenshotgen.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswunivu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswunivu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH @@ -197,8 +197,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\screenshotgen" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\screenshotgen.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\screenshotgen.pdb /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\screenshotgen.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\screenshotgen.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\..\lib\vc_lib\mswu" /I ".\..\..\..\include" /W4 /I "." /I ".\..\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\..\lib\vc_lib\mswu" /i ".\..\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\..\samples" /d NOPCH diff --git a/utils/screenshotgen/src/screenshotgen_vc7.vcproj b/utils/screenshotgen/src/screenshotgen_vc7.vcproj index 084adea089..8ebb764bfa 100644 --- a/utils/screenshotgen/src/screenshotgen_vc7.vcproj +++ b/utils/screenshotgen/src/screenshotgen_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_aui.lib wxmsw29u_adv.lib wxmsw29u_richtext.lib wxmsw29u_html.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\screenshotgen.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\screenshotgen.pdb" SubSystem="2" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_aui.lib wxmsw29u_adv.lib wxmsw29u_richtext.lib wxmsw29u_html.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\screenshotgen.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\screenshotgen.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_aui.lib wxmsw29u_adv.lib wxmsw29u_richtext.lib wxmsw29u_html.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\screenshotgen.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\screenshotgen.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_aui.lib wxmswuniv29u_adv.lib wxmswuniv29u_richtext.lib wxmswuniv29u_html.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\screenshotgen.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\screenshotgen.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxmsw29u_aui.lib wxmsw29u_adv.lib wxmsw29u_richtext.lib wxmsw29u_html.lib wxbase29u_xml.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\screenshotgen.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\screenshotgen.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxmswuniv29u_aui.lib wxmswuniv29u_adv.lib wxmswuniv29u_richtext.lib wxmswuniv29u_html.lib wxbase29u_xml.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\screenshotgen.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\screenshotgen.pdb" SubSystem="2" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) -LIBDIRNAME = \ - .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXRC_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\wxrc.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 /I. $(__DLLFLAG_p) \ - /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_9) $(__EXCEPTIONSFLAG_10) $(CPPFLAGS) \ - $(CXXFLAGS) -WXRC_OBJECTS = \ - $(OBJS)\wxrc_wxrc.obj - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(TARGET_CPU)" == "AMD64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "IA64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(TARGET_CPU)" == "amd64" -DIR_SUFFIX_CPU = _amd64 -!endif -!if "$(TARGET_CPU)" == "ia64" -DIR_SUFFIX_CPU = _ia64 -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:AMD64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(USE_XRC)" == "1" -__wxrc___depname = $(OBJS)\wxrc.exe -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_7 = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_7 = T -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_8 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_8 = $(__THREADSFLAG_7) -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG_9 = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG_9 = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_10 = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_10 = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_GDIPLUS)" == "1" -__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 -!endif -!if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_XML_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_GDIPLUS)" == "1" -__GDIPLUS_LIB_p = gdiplus.lib -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: $(__wxrc___depname) - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe - -if exist $(OBJS)\wxrc.ilk del $(OBJS)\wxrc.ilk - -if exist $(OBJS)\wxrc.pdb del $(OBJS)\wxrc.pdb - -!if "$(USE_XRC)" == "1" -$(OBJS)\wxrc.exe: $(WXRC_OBJECTS) - link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxrc.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< - $(WXRC_OBJECTS) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib -<< -!endif - -$(OBJS)\wxrc_wxrc.obj: .\wxrc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WXRC_CXXFLAGS) .\wxrc.cpp - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include <../../build/msw/config.vc> + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = vc +OBJS = \ + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU) +LIBDIRNAME = \ + .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +WXRC_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\wxrc.pdb $(__DEBUGINFO_2) \ + $(____DEBUGRUNTIME_3_p) $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ \ + $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ + $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ + $(__MSLU_DEFINE_p) $(__GFXCTX_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include /W4 \ + /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 $(__RTTIFLAG_11) \ + $(__EXCEPTIONSFLAG_12) $(CPPFLAGS) $(CXXFLAGS) +WXRC_OBJECTS = \ + $(OBJS)\wxrc_wxrc.obj + +### Conditionally set variables: ### + +!if "$(USE_GUI)" == "0" +PORTNAME = base +!endif +!if "$(USE_GUI)" == "1" +PORTNAME = msw +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +WXDEBUGFLAG = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +WXDEBUGFLAG = d +!endif +!if "$(UNICODE)" == "1" +WXUNICODEFLAG = u +!endif +!if "$(WXUNIV)" == "1" +WXUNIVNAME = univ +!endif +!if "$(TARGET_CPU)" == "AMD64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "IA64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(TARGET_CPU)" == "amd64" +DIR_SUFFIX_CPU = _amd64 +!endif +!if "$(TARGET_CPU)" == "ia64" +DIR_SUFFIX_CPU = _ia64 +!endif +!if "$(SHARED)" == "1" +WXDLLFLAG = dll +!endif +!if "$(SHARED)" == "0" +LIBTYPE_SUFFIX = lib +!endif +!if "$(SHARED)" == "1" +LIBTYPE_SUFFIX = dll +!endif +!if "$(TARGET_CPU)" == "AMD64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "IA64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(TARGET_CPU)" == "amd64" +LINK_TARGET_CPU = /MACHINE:AMD64 +!endif +!if "$(TARGET_CPU)" == "ia64" +LINK_TARGET_CPU = /MACHINE:IA64 +!endif +!if "$(MONOLITHIC)" == "0" +EXTRALIBS_FOR_BASE = +!endif +!if "$(MONOLITHIC)" == "1" +EXTRALIBS_FOR_BASE = +!endif +!if "$(USE_XRC)" == "1" +__wxrc___depname = $(OBJS)\wxrc.exe +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_0 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_0 = /Zi +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = $(__DEBUGRUNTIME_5) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_3_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_3_p = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_4 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_4 = d +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_5 = /opt:ref /opt:icf +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_5 = +!endif +!if "$(BUILD)" == "debug" +__OPTIMIZEFLAG_6 = /Od +!endif +!if "$(BUILD)" == "release" +__OPTIMIZEFLAG_6 = /O2 +!endif +!if "$(USE_THREADS)" == "0" +__THREADSFLAG_9 = L +!endif +!if "$(USE_THREADS)" == "1" +__THREADSFLAG_9 = T +!endif +!if "$(RUNTIME_LIBS)" == "dynamic" +__RUNTIME_LIBS_10 = D +!endif +!if "$(RUNTIME_LIBS)" == "static" +__RUNTIME_LIBS_10 = $(__THREADSFLAG_9) +!endif +!if "$(USE_RTTI)" == "0" +__RTTIFLAG_11 = +!endif +!if "$(USE_RTTI)" == "1" +__RTTIFLAG_11 = /GR +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONSFLAG_12 = +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__EXCEPTIONSFLAG_12 = /EHsc +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ +!endif +!if "$(DEBUG_FLAG)" == "0" +__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 +!endif +!if "$(USE_EXCEPTIONS)" == "0" +__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS +!endif +!if "$(USE_RTTI)" == "0" +__RTTI_DEFINE_p = /DwxNO_RTTI +!endif +!if "$(USE_THREADS)" == "0" +__THREAD_DEFINE_p = /DwxNO_THREADS +!endif +!if "$(UNICODE)" == "0" +__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p = /D_UNICODE +!endif +!if "$(MSLU)" == "1" +__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 +!endif +!if "$(USE_GDIPLUS)" == "1" +__GFXCTX_DEFINE_p = /DwxUSE_GRAPHICS_CONTEXT=1 +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_XML_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_BASE_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MONOLITHIC)" == "1" +__WXLIB_MONO_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +!if "$(MSLU)" == "1" +__UNICOWS_LIB_p = unicows.lib +!endif +!if "$(USE_GDIPLUS)" == "1" +__GDIPLUS_LIB_p = gdiplus.lib +!endif + + +all: $(OBJS) +$(OBJS): + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all: $(__wxrc___depname) + +clean: + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe + -if exist $(OBJS)\wxrc.ilk del $(OBJS)\wxrc.ilk + -if exist $(OBJS)\wxrc.pdb del $(OBJS)\wxrc.pdb + +!if "$(USE_XRC)" == "1" +$(OBJS)\wxrc.exe: $(WXRC_OBJECTS) + link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\wxrc.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(LDFLAGS) @<< + $(WXRC_OBJECTS) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib +<< +!endif + +$(OBJS)\wxrc_wxrc.obj: .\wxrc.cpp + $(CXX) /c /nologo /TP /Fo$@ $(WXRC_CXXFLAGS) .\wxrc.cpp + diff --git a/utils/wxrc/makefile.wat b/utils/wxrc/makefile.wat index 9ec78250ee..a0c88f68dc 100644 --- a/utils/wxrc/makefile.wat +++ b/utils/wxrc/makefile.wat @@ -1,250 +1,250 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.6 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include ../../build/msw/config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__wxrc___depname = -!ifeq USE_XRC 1 -__wxrc___depname = $(OBJS)\wxrc.exe -!endif -__DEBUGINFO_0 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_0 = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_0 = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_0 = -d2 -!endif -__DEBUGINFO_1 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_1 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_1 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_1 = debug all -!endif -__OPTIMIZEFLAG_2 = -!ifeq BUILD debug -__OPTIMIZEFLAG_2 = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG_2 = -ot -ox -!endif -__THREADSFLAG_5 = -!ifeq USE_THREADS 0 -__THREADSFLAG_5 = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG_5 = -bm -!endif -__RUNTIME_LIBS_6 = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS_6 = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS_6 = -!endif -__RTTIFLAG_7 = -!ifeq USE_RTTI 0 -__RTTIFLAG_7 = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG_7 = -xr -!endif -__EXCEPTIONSFLAG_8 = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG_8 = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG_8 = -xs -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -__GFXCTX_DEFINE_p = -!ifeq USE_GDIPLUS 1 -__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 -!endif -__DLLFLAG_p = -!ifeq SHARED 1 -__DLLFLAG_p = -dWXUSINGDLL -!endif -__WXLIB_XML_p = -!ifeq MONOLITHIC 0 -__WXLIB_XML_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib -!endif -__WXLIB_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIB_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__GDIPLUS_LIB_p = -!ifeq USE_GDIPLUS 1 -__GDIPLUS_LIB_p = gdiplus.lib -!endif - -### Variables: ### - -WX_RELEASE_NODOT = 29 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXRC_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & - $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & - $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & - -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & - -dwxUSE_GUI=0 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) -WXRC_OBJECTS = & - $(OBJS)\wxrc_wxrc.obj - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC $(__wxrc___depname) - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe - -!ifeq USE_XRC 1 -$(OBJS)\wxrc.exe : $(WXRC_OBJECTS) - @%create $(OBJS)\wxrc.lbc - @%append $(OBJS)\wxrc.lbc option quiet - @%append $(OBJS)\wxrc.lbc name $^@ - @%append $(OBJS)\wxrc.lbc option caseexact - @%append $(OBJS)\wxrc.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) - @for %i in ($(WXRC_OBJECTS)) do @%append $(OBJS)\wxrc.lbc file %i - @for %i in ( $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\wxrc.lbc library %i - @%append $(OBJS)\wxrc.lbc - @for %i in () do @%append $(OBJS)\wxrc.lbc option stack=%i - wlink @$(OBJS)\wxrc.lbc -!endif - -$(OBJS)\wxrc_wxrc.obj : .AUTODEPEND .\wxrc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WXRC_CXXFLAGS) $< - +# ========================================================================= +# This makefile was generated by +# Bakefile 0.2.7 (http://www.bakefile.org) +# Do not modify, all changes will be overwritten! +# ========================================================================= + +!include ../../build/msw/config.wat + +# ------------------------------------------------------------------------- +# Do not modify the rest of this file! +# ------------------------------------------------------------------------- + +# Speed up compilation a bit: +!ifdef __LOADDLL__ +! loaddll wcc wccd +! loaddll wccaxp wccdaxp +! loaddll wcc386 wccd386 +! loaddll wpp wppdi86 +! loaddll wppaxp wppdaxp +! loaddll wpp386 wppd386 +! if $(__VERSION__) >= 1280 +! loaddll wlink wlinkd +! else +! loaddll wlink wlink +! endif +! loaddll wlib wlibd +!endif + +# We need these variables in some bakefile-made rules: +WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- + +### Conditionally set variables: ### + +PORTNAME = +!ifeq USE_GUI 0 +PORTNAME = base +!endif +!ifeq USE_GUI 1 +PORTNAME = msw +!endif +WXDEBUGFLAG = +!ifeq BUILD debug +WXDEBUGFLAG = d +!endif +WXUNICODEFLAG = +!ifeq UNICODE 1 +WXUNICODEFLAG = u +!endif +WXUNIVNAME = +!ifeq WXUNIV 1 +WXUNIVNAME = univ +!endif +WXDLLFLAG = +!ifeq SHARED 1 +WXDLLFLAG = dll +!endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif +__wxrc___depname = +!ifeq USE_XRC 1 +__wxrc___depname = $(OBJS)\wxrc.exe +!endif +__DEBUGINFO_0 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d2 +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_0 = -d0 +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_0 = -d0 +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_0 = -d2 +!endif +__DEBUGINFO_1 = +!ifeq BUILD debug +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = debug all +!endif +!endif +!ifeq BUILD release +!ifeq DEBUG_INFO default +__DEBUGINFO_1 = +!endif +!endif +!ifeq DEBUG_INFO 0 +__DEBUGINFO_1 = +!endif +!ifeq DEBUG_INFO 1 +__DEBUGINFO_1 = debug all +!endif +__OPTIMIZEFLAG_2 = +!ifeq BUILD debug +__OPTIMIZEFLAG_2 = -od +!endif +!ifeq BUILD release +__OPTIMIZEFLAG_2 = -ot -ox +!endif +__THREADSFLAG_5 = +!ifeq USE_THREADS 0 +__THREADSFLAG_5 = +!endif +!ifeq USE_THREADS 1 +__THREADSFLAG_5 = -bm +!endif +__RUNTIME_LIBS_6 = +!ifeq RUNTIME_LIBS dynamic +__RUNTIME_LIBS_6 = -br +!endif +!ifeq RUNTIME_LIBS static +__RUNTIME_LIBS_6 = +!endif +__RTTIFLAG_7 = +!ifeq USE_RTTI 0 +__RTTIFLAG_7 = +!endif +!ifeq USE_RTTI 1 +__RTTIFLAG_7 = -xr +!endif +__EXCEPTIONSFLAG_8 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_8 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_8 = -xs +!endif +__WXUNIV_DEFINE_p = +!ifeq WXUNIV 1 +__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ +!endif +__DEBUG_DEFINE_p = +!ifeq DEBUG_FLAG 0 +__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 +!endif +__EXCEPTIONS_DEFINE_p = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS +!endif +__RTTI_DEFINE_p = +!ifeq USE_RTTI 0 +__RTTI_DEFINE_p = -dwxNO_RTTI +!endif +__THREAD_DEFINE_p = +!ifeq USE_THREADS 0 +__THREAD_DEFINE_p = -dwxNO_THREADS +!endif +__UNICODE_DEFINE_p = +!ifeq UNICODE 0 +__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 +!endif +!ifeq UNICODE 1 +__UNICODE_DEFINE_p = -d_UNICODE +!endif +__GFXCTX_DEFINE_p = +!ifeq USE_GDIPLUS 1 +__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1 +!endif +__DLLFLAG_p = +!ifeq SHARED 1 +__DLLFLAG_p = -dWXUSINGDLL +!endif +__WXLIB_XML_p = +!ifeq MONOLITHIC 0 +__WXLIB_XML_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib +!endif +__WXLIB_BASE_p = +!ifeq MONOLITHIC 0 +__WXLIB_BASE_p = & + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__WXLIB_MONO_p = +!ifeq MONOLITHIC 1 +__WXLIB_MONO_p = & + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +!endif +__GDIPLUS_LIB_p = +!ifeq USE_GDIPLUS 1 +__GDIPLUS_LIB_p = gdiplus.lib +!endif + +### Variables: ### + +WX_RELEASE_NODOT = 29 +COMPILER_PREFIX = wat +OBJS = & + $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +WXRC_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) & + $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & + $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) & + $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) & + -i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) & + -dwxUSE_GUI=0 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS) +WXRC_OBJECTS = & + $(OBJS)\wxrc_wxrc.obj + + +all : $(OBJS) +$(OBJS) : + -if not exist $(OBJS) mkdir $(OBJS) + +### Targets: ### + +all : .SYMBOLIC $(__wxrc___depname) + +clean : .SYMBOLIC + -if exist $(OBJS)\*.obj del $(OBJS)\*.obj + -if exist $(OBJS)\*.res del $(OBJS)\*.res + -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc + -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch + -if exist $(OBJS)\wxrc.exe del $(OBJS)\wxrc.exe + +!ifeq USE_XRC 1 +$(OBJS)\wxrc.exe : $(WXRC_OBJECTS) + @%create $(OBJS)\wxrc.lbc + @%append $(OBJS)\wxrc.lbc option quiet + @%append $(OBJS)\wxrc.lbc name $^@ + @%append $(OBJS)\wxrc.lbc option caseexact + @%append $(OBJS)\wxrc.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' $(LDFLAGS) + @for %i in ($(WXRC_OBJECTS)) do @%append $(OBJS)\wxrc.lbc file %i + @for %i in ( $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\wxrc.lbc library %i + @%append $(OBJS)\wxrc.lbc + @for %i in () do @%append $(OBJS)\wxrc.lbc option stack=%i + wlink @$(OBJS)\wxrc.lbc +!endif + +$(OBJS)\wxrc_wxrc.obj : .AUTODEPEND .\wxrc.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(WXRC_CXXFLAGS) $< + diff --git a/utils/wxrc/wxrc.dsp b/utils/wxrc/wxrc.dsp index 7245f3feb8..2a17f4ca7e 100644 --- a/utils/wxrc/wxrc.dsp +++ b/utils/wxrc/wxrc.dsp @@ -46,8 +46,8 @@ RSC=rc.exe # PROP Output_Dir "vc_mswunivudll" # PROP Intermediate_Dir "vc_mswunivudll\wxrc" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wxrc.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wxrc.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wxrc.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\wxrc.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe @@ -92,8 +92,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswudll" # PROP Intermediate_Dir "vc_mswudll\wxrc" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wxrc.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wxrc.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wxrc.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\wxrc.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe @@ -138,8 +138,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswunivu" # PROP Intermediate_Dir "vc_mswunivu\wxrc" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wxrc.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wxrc.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wxrc.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\wxrc.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe @@ -184,8 +184,8 @@ LINK32=link.exe # PROP Output_Dir "vc_mswu" # PROP Intermediate_Dir "vc_mswu\wxrc" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\wxrc.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c -# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\wxrc.pdb /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\wxrc.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c +# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\wxrc.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_CONSOLE" /D wxUSE_GUI=0 /c # ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 # ADD RSC /l 0x409 /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_CONSOLE" /d wxUSE_GUI=0 BSC32=bscmake.exe diff --git a/utils/wxrc/wxrc_vc7.vcproj b/utils/wxrc/wxrc_vc7.vcproj index 747c031ad2..719519dc93 100644 --- a/utils/wxrc/wxrc_vc7.vcproj +++ b/utils/wxrc/wxrc_vc7.vcproj @@ -2,7 +2,7 @@ @@ -110,13 +110,15 @@ AdditionalOptions="" AdditionalDependencies="wxbase29u_xml.lib wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\wxrc.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile="vc_mswu\wxrc.pdb" SubSystem="1" - TargetMachine="1"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> + TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2"/> @@ -176,7 +176,7 @@ AdditionalOptions="" AdditionalDependencies="wxbase29u_xml.lib wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\wxrc.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -184,6 +184,8 @@ ProgramDatabaseFile="vc_mswu\wxrc.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -43,7 +43,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -136,7 +136,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -172,7 +172,7 @@ AdditionalOptions="" AdditionalDependencies="wxbase29u_xml.lib wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswu\wxrc.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -180,6 +180,8 @@ ProgramDatabaseFile="vc_mswu\wxrc.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -320,7 +322,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -356,7 +358,7 @@ AdditionalOptions="" AdditionalDependencies="wxbase29u_xml.lib wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivu\wxrc.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_lib" GenerateManifest="true" @@ -364,6 +366,8 @@ ProgramDatabaseFile="vc_mswunivu\wxrc.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -504,7 +508,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -540,7 +544,7 @@ AdditionalOptions="" AdditionalDependencies="wxbase29u_xml.lib wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswudll\wxrc.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -548,6 +552,8 @@ ProgramDatabaseFile="vc_mswudll\wxrc.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" /> @@ -688,7 +694,7 @@ Name="VCWebServiceProxyGeneratorTool" /> @@ -724,7 +730,7 @@ AdditionalOptions="" AdditionalDependencies="wxbase29u_xml.lib wxbase29u.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib" OutputFile="vc_mswunivudll\wxrc.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories=".\..\..\lib\vc_dll" GenerateManifest="true" @@ -732,6 +738,8 @@ ProgramDatabaseFile="vc_mswunivudll\wxrc.pdb" SubSystem="1" TargetMachine="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" />